Update path aliases and move logger

.storybook/preview.tsx

@@ -6,7 +6,7 @@ import { initialize, mswLoader } from 'msw-storybook-addon';
 import { handlers } from '../src/mocks/handlers';
 import { theme } from '../src/theme';
 import { MathJaxProvider } from '../src/mathjax';
-import { useCreateQueryClient } from '@lib';
+import { useCreateQueryClient } from '@/lib';
 
 export const parameters = {
   chakra: { theme },

__mocks__/zustand.ts

@@ -1,4 +1,4 @@
-import { Store } from '@store';
+import { Store } from '@/store';
 import actualCreate from 'zustand';
 import { afterEach } from 'vitest';
 import { act } from '@testing-library/react';

scripts/react/templates.js

@@ -37,7 +37,7 @@ export default meta;
 export const Default: Story = {};
 `;
 
-exports.test = (name) => `import { render } from '@test-utils';
+exports.test = (name) => `import { render } from '@/test-utils';
 import { test } from 'vitest';
 import { composeStories } from '@storybook/testing-react';
 import * as stories from '../__stories__/${name}.stories';

src/__tests__/paper-form.test.tsx

@@ -1,4 +1,4 @@
-import { render } from '@test-utils';
+import { render } from '@/test-utils';
 import { beforeEach, describe, test, vi } from 'vitest';
 import PaperForm from '../pages/paper-form';
 

src/__tests__/query-utils.test.ts

@@ -1,6 +1,6 @@
-import { IADSApiSearchParams } from '@api';
-import * as query from '@query-utils';
-import { defaultQueryParams } from '@store/slices';
+import { IADSApiSearchParams } from '@/api';
+import * as query from '@/query-utils';
+import { defaultQueryParams } from '@/store/slices';
 import { describe, expect, test } from 'vitest';
 
 const testQuery: IADSApiSearchParams = {

src/__tests__/query.test.ts

@@ -1,4 +1,4 @@
-import * as Q from '@query';
+import * as Q from '@/query';
 import { describe, expect, it } from 'vitest';
 
 describe('Query Utilities', () => {

src/__tests__/utils.test.ts

@@ -1,6 +1,6 @@
-import api from '@api';
-import { APP_DEFAULTS } from '@config';
-import { normalizeSolrSort, parseAPIError } from '@utils';
+import api from '@/api';
+import { APP_DEFAULTS } from '@/config';
+import { normalizeSolrSort, parseAPIError } from '@/utils';
 import { beforeEach, describe, expect, test, TestContext } from 'vitest';
 import { rest } from 'msw';
 

src/api/__tests__/api.test.ts

@@ -1,11 +1,11 @@
-import api, { IBootstrapPayload } from '@api';
-import { ApiRequestConfig } from '@api/api';
-import { APP_STORAGE_KEY } from '@store';
-import { createServerListenerMocks } from '@test-utils';
+import api, { IBootstrapPayload } from '@/api';
+import { ApiRequestConfig } from '@/api/api';
+import { APP_STORAGE_KEY } from '@/store';
+import { createServerListenerMocks } from '@/test-utils';
 import { rest } from 'msw';
 import { map, path, pipe, repeat } from 'ramda';
 import { beforeEach, expect, Mock, test, TestContext, vi } from 'vitest';
-import { IApiUserResponse } from '@pages/api/user';
+import { IApiUserResponse } from '@/pages/api/user';
 
 global.alert = vi.fn();
 

src/api/api.ts

@@ -1,11 +1,11 @@
-import { IUserData } from '@api';
-import { APP_STORAGE_KEY, updateAppUser } from '@store';
+import { IUserData } from '@/api';
+import { APP_STORAGE_KEY, updateAppUser } from '@/store';
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { isPast, parseISO } from 'date-fns';
 import { identity, isNil } from 'ramda';
 import { defaultRequestConfig } from './config';
-import { IApiUserResponse } from '@pages/api/user';
-import { logger } from '../../logger/logger';
+import { IApiUserResponse } from '@/pages/api/user';
+import { logger } from '@/logger';
 import { buildStorage, CacheOptions, setupCache, StorageValue } from 'axios-cache-interceptor';
 
 export const isUserData = (userData?: IUserData): userData is IUserData => {

src/api/author-affiliation/author-affiliation.ts

@@ -1,6 +1,6 @@
-import api, { ApiRequestConfig } from '@api/api';
-import { ApiTargets } from '@api/models';
-import { ADSQuery } from '@api/types';
+import api, { ApiRequestConfig } from '@/api/api';
+import { ApiTargets } from '@/api/models';
+import { ADSQuery } from '@/api/types';
 import { QueryFunction, useQuery } from '@tanstack/react-query';
 import { getAuthorAffiliationSearchParams } from './model';
 import { IAuthorAffiliationExportPayload, IAuthorAffiliationPayload, IAuthorAffiliationResponse } from './types';

src/api/author-affiliation/types.ts

@@ -1,4 +1,4 @@
-import { exportTypes } from '@components/AuthorAffiliations/models';
+import { exportTypes } from '@/components/AuthorAffiliations/models';
 
 /**
  * @example

src/api/biblib/libraries.ts

@@ -35,7 +35,7 @@ import api, {
   IADSApiLibraryUpdateAnnotationParams,
   IADSApiLibraryDeleteAnnotationResponse,
   IADSApiLibraryDeleteAnnotationParams,
-} from '@api';
+} from '@/api';
 import { MutationFunction, QueryFunction, useMutation, useQuery } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
 import { omit } from 'ramda';

src/api/biblib/types.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
-import { BiblibSort, SolrSort } from '@api/models';
-import { IADSApiSearchParams, IDocsEntity } from '@api/search';
+import { BiblibSort, SolrSort } from '@/api/models';
+import { IADSApiSearchParams, IDocsEntity } from '@/api/search';
 
 export const permissions = ['owner', 'admin', 'write', 'read'];
 

src/api/config.ts

@@ -1,8 +1,8 @@
-import { AppRuntimeConfig } from '@types';
+import { AppRuntimeConfig } from '@/types';
 import { AxiosRequestConfig } from 'axios';
 import getConfig from 'next/config';
 import qs from 'qs';
-import { APP_DEFAULTS } from '@config';
+import { APP_DEFAULTS } from '@/config';
 
 /**
  * Figure out which config to pick, based on the current environment

src/api/export/export.ts

@@ -1,4 +1,4 @@
-import { ADSQuery, ApiTargets } from '@api';
+import { ADSQuery, ApiTargets } from '@/api';
 import { QueryFunction, useQuery, UseQueryResult } from '@tanstack/react-query';
 import api, { ApiRequestConfig } from '../api';
 import { ExportApiFormatKey, IExportApiParams, IExportApiResponse } from './types';

src/api/export/types.ts

@@ -1,5 +1,5 @@
-import { IADSApiSearchParams, IDocsEntity } from '@api';
-import { enumKeys } from '@utils';
+import { IADSApiSearchParams, IDocsEntity } from '@/api';
+import { enumKeys } from '@/utils';
 
 /**
  * @see https://github.com/adsabs/export_service#readme

src/api/feedback/feedback.ts

@@ -1,4 +1,4 @@
-import api, { ADSMutation, ApiRequestConfig, ApiTargets } from '@api';
+import api, { ADSMutation, ApiRequestConfig, ApiTargets } from '@/api';
 import { MutationFunction, useMutation } from '@tanstack/react-query';
 import { IFeedbackParams, IADSApiFeedbackResponse } from './types';
 

src/api/feedback/types.ts

@@ -1,4 +1,4 @@
-import { ADSQuery } from '@api';
+import { ADSQuery } from '@/api';
 
 export type FeedbackBaseParams = {
   name: string;

src/api/graphics/graphics.ts

@@ -1,4 +1,4 @@
-import api, { ADSQuery, ApiRequestConfig, ApiTargets, IADSApiGraphicsParams, IDocsEntity } from '@api';
+import api, { ADSQuery, ApiRequestConfig, ApiTargets, IADSApiGraphicsParams, IDocsEntity } from '@/api';
 import { isNil } from 'ramda';
 import { QueryFunction, useQuery, UseQueryResult } from '@tanstack/react-query';
 import { IADSApiGraphicsResponse } from './types';

src/api/metrics/metrics.ts

@@ -7,7 +7,7 @@ import api, {
   CitationsStatsKey,
   IADSApiMetricsParams,
   MetricsResponseKey,
-} from '@api';
+} from '@/api';
 import { isNil } from 'ramda';
 import { QueryFunction, useQuery } from '@tanstack/react-query';
 import { getMetricsParams, getMetricsTimeSeriesParams } from './model';

src/api/objects/helpers.ts

@@ -1,4 +1,4 @@
-import { splitQuery } from '@query';
+import { splitQuery } from '@/query';
 
 export const replaceObjectTerms = (query: string) => {
   const replaceObjectWithAbs = (term: string) => term.replace('object:', 'abs:');

src/api/objects/objects.ts

@@ -1,10 +1,10 @@
-import api, { ADSQuery, ApiRequestConfig, ApiTargets } from '@api';
-import { IObjectsApiParams, IObjectsApiResult, ObjectService } from '@api/objects/types';
+import api, { ADSQuery, ApiRequestConfig, ApiTargets } from '@/api';
+import { IObjectsApiParams, IObjectsApiResult, ObjectService } from '@/api/objects/types';
 import { useQuery } from '@tanstack/react-query';
-import { isString } from '@utils';
+import { isString } from '@/utils';
 import { isNotEmpty } from 'ramda-adjunct';
-import { hasObjectTerm, replaceObjectTerms } from '@api/objects/helpers';
-import { APP_DEFAULTS } from '@config';
+import { hasObjectTerm, replaceObjectTerms } from '@/api/objects/helpers';
+import { APP_DEFAULTS } from '@/config';
 
 export enum OBJECTS_API_KEYS {
   QUERY = 'object/query',

src/api/orcid/models.ts

@@ -1,9 +1,9 @@
-import { isString } from '@utils';
+import { isString } from '@/utils';
 import { isNilOrEmpty, isNumber, isObject } from 'ramda-adjunct';
-import { IOrcidUser } from '@api/orcid/types';
+import { IOrcidUser } from '@/api/orcid/types';
 import { allPass, has } from 'ramda';
 import { addSeconds, isValid } from 'date-fns';
-import { IOrcidProfileEntry } from '@api/orcid/types/orcid-profile';
+import { IOrcidProfileEntry } from '@/api/orcid/types/orcid-profile';
 
 const orcidRegex = /^\d{4}-\d{4}-\d{4}-\d{3}[0-9X]$/;
 

src/api/orcid/orcid.ts

@@ -1,12 +1,12 @@
-import api, { ADSMutation, ADSQuery, ApiRequestConfig, ApiTargets } from '@api';
+import api, { ADSMutation, ADSQuery, ApiRequestConfig, ApiTargets } from '@/api';
 import { MutationFunction, QueryFunction, useMutation, useQuery } from '@tanstack/react-query';
-import { IOrcidMutationParams, IOrcidParams, IOrcidResponse, IOrcidUser, IOrcidWork } from '@api/orcid/types';
-import { isValidIOrcidUser } from '@api/orcid/models';
+import { IOrcidMutationParams, IOrcidParams, IOrcidResponse, IOrcidUser, IOrcidWork } from '@/api/orcid/types';
+import { isValidIOrcidUser } from '@/api/orcid/models';
 import { omit } from 'ramda';
-import { ORCID_BULK_DELETE_CHUNK_SIZE, ORCID_BULK_DELETE_DELAY } from '@config';
-import { asyncDelay } from '@utils';
-import { getExIds } from '@lib/orcid/helpers';
-import { OrcidErrorResponse } from '@api/orcid/types/common';
+import { ORCID_BULK_DELETE_CHUNK_SIZE, ORCID_BULK_DELETE_DELAY } from '@/config';
+import { asyncDelay } from '@/utils';
+import { getExIds } from '@/lib/orcid/helpers';
+import { OrcidErrorResponse } from '@/api/orcid/types/common';
 
 export enum OrcidKeys {
   EXCHANGE_TOKEN = 'orcid/exchange-token',

src/api/orcid/types/index.ts

@@ -1,9 +1,9 @@
-import type { IOrcidUser } from '@api/orcid/types/orcid-user';
-import type { IOrcidProfile } from '@api/orcid/types/orcid-profile';
-import type { IOrcidName } from '@api/orcid/types/orcid-name';
-import type { IOrcidWork } from '@api/orcid/types/orcid-work';
-import { IOrcidPreferences } from '@api/orcid/types/orcid-preferences';
-import { OrcidErrorResponse } from '@api/orcid/types/common';
+import type { IOrcidUser } from '@/api/orcid/types/orcid-user';
+import type { IOrcidProfile } from '@/api/orcid/types/orcid-profile';
+import type { IOrcidName } from '@/api/orcid/types/orcid-name';
+import type { IOrcidWork } from '@/api/orcid/types/orcid-work';
+import { IOrcidPreferences } from '@/api/orcid/types/orcid-preferences';
+import { OrcidErrorResponse } from '@/api/orcid/types/common';
 
 export type { IOrcidWork } from './orcid-work';
 export type { IOrcidProfile } from './orcid-profile';

src/api/orcid/types/orcid-name.ts

@@ -1,4 +1,4 @@
-import { IValue } from '@api/orcid/types/common';
+import { IValue } from '@/api/orcid/types/common';
 
 export interface IOrcidName {
   'last-modified-date': IValue;

src/api/reference/reference.ts

@@ -1,4 +1,4 @@
-import api, { ADSQuery, ApiRequestConfig, ApiTargets } from '@api';
+import api, { ADSQuery, ApiRequestConfig, ApiTargets } from '@/api';
 import { QueryFunction, useQuery } from '@tanstack/react-query';
 import { IADSApiReferenceResponse } from './types';
 

src/api/resolver/resolver.ts

@@ -1,6 +1,6 @@
-import api, { ApiRequestConfig } from '@api/api';
-import { ApiTargets } from '@api/models';
-import { ADSQuery } from '@api/types';
+import api, { ApiRequestConfig } from '@/api/api';
+import { ApiTargets } from '@/api/models';
+import { ADSQuery } from '@/api/types';
 import { QueryFunction, useQuery } from '@tanstack/react-query';
 import { IADSApiResolverParams, IADSApiResolverResponse } from './types';
 

src/api/search/models.ts

@@ -1,5 +1,5 @@
-import { IADSApiSearchParams, IDocsEntity } from '@api';
-import { APP_DEFAULTS } from '@config';
+import { IADSApiSearchParams, IDocsEntity } from '@/api';
+import { APP_DEFAULTS } from '@/config';
 
 export const defaultFields: IADSApiSearchParams['fl'] = [
   'bibcode',

src/api/search/search.ts

@@ -9,7 +9,7 @@ import api, {
   IBigQueryMutationParams,
   IDocsEntity,
   InfiniteADSQuery,
-} from '@api';
+} from '@/api';
 import axios, { AxiosError } from 'axios';
 import { omit } from 'ramda';
 import {
@@ -37,8 +37,8 @@ import {
   getSingleRecordParams,
   getTocParams,
 } from './models';
-import { isString } from '@utils';
-import { resolveObjectQuery } from '@api/objects/objects';
+import { isString } from '@/utils';
+import { resolveObjectQuery } from '@/api/objects/objects';
 
 type ErrorType = Error | AxiosError;
 

src/api/user/models.ts

@@ -1,4 +1,4 @@
-import { APP_DEFAULTS } from '@config';
+import { APP_DEFAULTS } from '@/config';
 import { DatabaseEnum, ExternalLinkAction, IADSApiUserDataResponse, JournalFormatName, UserDataKeys } from './types';
 
 export const DEFAULT_USER_DATA: IADSApiUserDataResponse = {

src/api/user/user.ts

@@ -20,9 +20,9 @@ import api, {
   IUserForgotPasswordCredentials,
   IUserRegistrationCredentials,
   IUserResetPasswordCredentials,
-} from '@api';
-import { configWithCSRF, isValidToken } from '@auth-utils';
-import { defaultRequestConfig } from '@api/config';
+} from '@/api';
+import { configWithCSRF, isValidToken } from '@/auth-utils';
+import { defaultRequestConfig } from '@/api/config';
 
 export enum UserKeys {
   USER_API_TOKEN = 'user-api-token',

src/api/vault/models.ts

@@ -1,4 +1,4 @@
-import { IADSApiSearchParams, IDocsEntity } from '@api';
+import { IADSApiSearchParams, IDocsEntity } from '@/api';
 
 export const getVaultBigQueryParams = (bibcodes: IDocsEntity['bibcode'][]): IADSApiSearchParams => ({
   q: '*:*',

src/api/vault/types.ts

@@ -1,4 +1,4 @@
-import { IADSApiSearchParams } from '@api/search';
+import { IADSApiSearchParams } from '@/api/search';
 
 export interface IADSVaultExecuteQueryParams {
   qid: string;

src/api/vault/vault.ts

@@ -7,7 +7,7 @@ import api, {
   IADSApiSearchParams,
   IADSApiSearchResponse,
   IDocsEntity,
-} from '@api';
+} from '@/api';
 import { MutationFunction, QueryFunction, useQuery, UseQueryOptions, useMutation } from '@tanstack/react-query';
 import { omit } from 'ramda';
 import { getVaultBigQueryParams } from './models';

src/api/vis/models.ts

@@ -1,4 +1,4 @@
-import { IADSApiSearchParams } from '@api/search';
+import { IADSApiSearchParams } from '@/api/search';
 import { mapObjIndexed } from 'ramda';
 import { IADSApiVisParams, IADSApiWordCloudParams } from './types';
 

src/api/vis/types.ts

@@ -1,4 +1,4 @@
-import { Bibcode, IADSApiSearchParams } from '@api';
+import { Bibcode, IADSApiSearchParams } from '@/api';
 
 export interface IADSApiVisParams {
   bibcodes?: Bibcode[];

src/api/vis/vis.ts

@@ -1,13 +1,13 @@
-import api, { ADSQuery, ApiRequestConfig } from '@api';
-import { ApiTargets } from '@api/models';
+import api, { ADSQuery, ApiRequestConfig } from '@/api';
+import { ApiTargets } from '@/api/models';
 import {
   IADSApiAuthorNetworkResponse,
   IADSApiPaperNetworkResponse,
   IADSApiVisParams,
   IADSApiWordCloudParams,
   IADSApiWordCloudResponse,
 } from './types';
-import { IADSApiSearchParams, IADSApiSearchResponse } from '@api/search';
+import { IADSApiSearchParams, IADSApiSearchResponse } from '@/api/search';
 import { QueryFunction, useQuery } from '@tanstack/react-query';
 import { getAuthorNetworkParams, getPaperNetworkParams, getResultsGraphParams, getWordCloudParams } from './models';
 

src/auth-utils.ts

@@ -1,9 +1,9 @@
 import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
-import { ApiRequestConfig, ApiTargets, IBootstrapPayload, ICSRFResponse, IUserData } from '@api';
-import { defaultRequestConfig } from '@api/config';
+import { ApiRequestConfig, ApiTargets, IBootstrapPayload, ICSRFResponse, IUserData } from '@/api';
+import { defaultRequestConfig } from '@/api/config';
 import { isNil } from 'ramda';
 import { isPast, parseISO } from 'date-fns';
-import { APP_DEFAULTS } from '@config';
+import { APP_DEFAULTS } from '@/config';
 
 const fetchCSRF = async () =>
   await axios.get<ICSRFResponse, AxiosResponse<ICSRFResponse>>(ApiTargets.CSRF, {

src/components/AbstractRefList/AbstractRefList.tsx

@@ -1,11 +1,11 @@
-import { IADSApiSearchParams, IDocsEntity } from '@api';
+import { IADSApiSearchParams, IDocsEntity } from '@/api';
 import { Stack } from '@chakra-ui/react';
-import { SimpleResultList } from '@components';
-import { Pagination, PaginationProps } from '@components/ResultList/Pagination';
-import { calculateStartIndex } from '@components/ResultList/Pagination/usePagination';
-import { SearchQueryLink } from '@components/SearchQueryLink';
-import { APP_DEFAULTS } from '@config';
-import { noop, parseQueryFromUrl, stringifySearchParams } from '@utils';
+import { SimpleResultList } from '@/components';
+import { Pagination, PaginationProps } from '@/components/ResultList/Pagination';
+import { calculateStartIndex } from '@/components/ResultList/Pagination/usePagination';
+import { SearchQueryLink } from '@/components/SearchQueryLink';
+import { APP_DEFAULTS } from '@/config';
+import { noop, parseQueryFromUrl, stringifySearchParams } from '@/utils';
 import { useRouter } from 'next/router';
 import { ReactElement } from 'react';