Skip to content

refactor: remove no more needed .js from imports #2424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/contentful.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ import axios from 'axios'
import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'

import { createHttpClient, getUserAgentHeader } from 'contentful-sdk-core'
import { createGlobalOptions } from './create-global-options.js'
import { makeClient } from './make-client.js'
import {
validateRemoveUnresolvedParam,
validateResolveLinksParam,
} from './utils/validate-params.js'
import type { ContentfulClientApi } from './types/client.js'
import { createGlobalOptions } from './create-global-options'
import { makeClient } from './make-client'
import { validateRemoveUnresolvedParam, validateResolveLinksParam } from './utils/validate-params'
import type { ContentfulClientApi } from './types/client'

/**
* @category Client
Expand Down
24 changes: 12 additions & 12 deletions lib/create-contentful-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import { encodeCPAResponse } from '@contentful/content-source-maps'
import { AxiosInstance, createRequestConfig, errorHandler } from 'contentful-sdk-core'
import { CreateClientParams } from './contentful.js'
import { GetGlobalOptions } from './create-global-options.js'
import pagedSync from './paged-sync.js'
import { CreateClientParams } from './contentful'
import { GetGlobalOptions } from './create-global-options'
import pagedSync from './paged-sync'
import type {
Asset,
AssetCollection,
Expand All @@ -28,20 +28,20 @@ import type {
Concept,
ConceptScheme,
ConceptSchemeCollection,
} from './types/index.js'
import normalizeSearchParameters from './utils/normalize-search-parameters.js'
import normalizeSelect from './utils/normalize-select.js'
import resolveCircular from './utils/resolve-circular.js'
import getQuerySelectionSet from './utils/query-selection-set.js'
import validateTimestamp from './utils/validate-timestamp.js'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
} from './types/index'
import normalizeSearchParameters from './utils/normalize-search-parameters'
import normalizeSelect from './utils/normalize-select'
import resolveCircular from './utils/resolve-circular'
import getQuerySelectionSet from './utils/query-selection-set'
import validateTimestamp from './utils/validate-timestamp'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
import {
checkIncludeContentSourceMapsParamIsAllowed,
validateLocaleParam,
validateRemoveUnresolvedParam,
validateResolveLinksParam,
} from './utils/validate-params.js'
import validateSearchParameters from './utils/validate-search-parameters.js'
} from './utils/validate-params'
import validateSearchParameters from './utils/validate-search-parameters'

const ASSET_KEY_MAX_LIFETIME = 48 * 60 * 60

Expand Down
12 changes: 6 additions & 6 deletions lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * from './contentful.js'
export * from './create-global-options.js'
export * from './mixins/stringify-safe.js'
export * from './utils/normalize-select.js'
export * from './utils/resolve-circular.js'
export * from './contentful'
export * from './create-global-options'
export * from './mixins/stringify-safe'
export * from './utils/normalize-select'
export * from './utils/resolve-circular'

export * from './types/index.js'
export * from './types/index'
6 changes: 3 additions & 3 deletions lib/make-client.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api.js'
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api'
import {
ChainOptions,
DefaultChainOption,
ChainOption,
ModifiersFromOptions,
} from './utils/client-helpers.js'
import type { ContentfulClientApi } from './types/index.js'
} from './utils/client-helpers'
import type { ContentfulClientApi } from './types/index'

function create<OptionsType extends ChainOptions>(
{ http, getGlobalOptions }: CreateContentfulApiParams,
Expand Down
6 changes: 3 additions & 3 deletions lib/paged-sync.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import resolveResponse from 'contentful-resolve-response'
import { AxiosInstance, createRequestConfig, freezeSys, toPlainObject } from 'contentful-sdk-core'
import mixinStringifySafe from './mixins/stringify-safe.js'
import mixinStringifySafe from './mixins/stringify-safe'
import type {
SyncPageQuery,
SyncResponse,
Expand All @@ -11,8 +11,8 @@ import type {
SyncQuery,
LocaleCode,
EntrySkeletonType,
} from './types/index.js'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
} from './types/index'
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'

/**
* Retrieves all the available pages for a sync operation
Expand Down
10 changes: 5 additions & 5 deletions lib/types/asset.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ContentfulCollection } from './collection.js'
import { LocaleCode } from './locale.js'
import { Metadata } from './metadata.js'
import { EntitySys } from './sys.js'
import { ChainModifiers } from './client.js'
import { ContentfulCollection } from './collection'
import { LocaleCode } from './locale'
import { Metadata } from './metadata'
import { EntitySys } from './sys'
import { ChainModifiers } from './client'

/**
* @category Asset
Expand Down
22 changes: 11 additions & 11 deletions lib/types/client.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ContentType, ContentTypeCollection } from './content-type.js'
import { Space } from './space.js'
import { LocaleCode, LocaleCollection } from './locale.js'
import { ContentType, ContentTypeCollection } from './content-type'
import { Space } from './space'
import { LocaleCode, LocaleCollection } from './locale'
import {
AssetQueries,
AssetsQueries,
Expand All @@ -10,14 +10,14 @@ import {
EntryQueries,
EntrySkeletonType,
TagQueries,
} from './query/index.js'
import { SyncCollection, SyncOptions, SyncQuery } from './sync.js'
import { Tag, TagCollection } from './tag.js'
import { AssetKey } from './asset-key.js'
import { Entry, EntryCollection } from './entry.js'
import { Asset, AssetCollection, AssetFields } from './asset.js'
import { Concept, ConceptCollection } from './concept.js'
import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme.js'
} from './query/index'
import { SyncCollection, SyncOptions, SyncQuery } from './sync'
import { Tag, TagCollection } from './tag'
import { AssetKey } from './asset-key'
import { Entry, EntryCollection } from './entry'
import { Asset, AssetCollection, AssetFields } from './asset'
import { Concept, ConceptCollection } from './concept'
import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme'

/**
* Client chain modifiers used in all types that depend on the client configuration.
Expand Down
4 changes: 2 additions & 2 deletions lib/types/collection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AssetSys } from './asset.js'
import { EntrySys } from './entry.js'
import { AssetSys } from './asset'
import { EntrySys } from './entry'

/**
* A wrapper object containing additional information for
Expand Down
8 changes: 4 additions & 4 deletions lib/types/content-type.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ContentfulCollection } from './collection.js'
import { EntryFields } from './entry.js'
import { SpaceLink, EnvironmentLink } from './link.js'
import { BaseSys } from './sys.js'
import { ContentfulCollection } from './collection'
import { EntryFields } from './entry'
import { SpaceLink, EnvironmentLink } from './link'
import { BaseSys } from './sys'
import type { BLOCKS, INLINES } from '@contentful/rich-text-types'

/**
Expand Down
18 changes: 9 additions & 9 deletions lib/types/entry.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Document as RichTextDocument } from '@contentful/rich-text-types'
import { Asset } from './asset.js'
import { ContentfulCollection } from './collection.js'
import { ContentTypeLink, UnresolvedLink } from './link.js'
import { LocaleCode } from './locale.js'
import { Metadata } from './metadata.js'
import { EntrySkeletonType } from './query/index.js'
import { EntitySys } from './sys.js'
import { Asset } from './asset'
import { ContentfulCollection } from './collection'
import { ContentTypeLink, UnresolvedLink } from './link'
import { LocaleCode } from './locale'
import { Metadata } from './metadata'
import { EntrySkeletonType } from './query/index'
import { EntitySys } from './sys'
import { JsonArray, JsonObject } from 'type-fest'
import { ResourceLink } from './resource-link.js'
import { ChainModifiers } from './client.js'
import { ResourceLink } from './resource-link'
import { ChainModifiers } from './client'

/**
* System managed metadata for entries
Expand Down
34 changes: 17 additions & 17 deletions lib/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
export * from './asset.js'
export * from './asset-key.js'
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client.js'
export * from './collection.js'
export * from './concept-scheme.js'
export * from './concept.js'
export * from './content-type.js'
export * from './entry.js'
export * from './link.js'
export * from './locale.js'
export * from './metadata.js'
export * from './query/index.js'
export * from './resource-link.js'
export * from './space.js'
export * from './sync.js'
export * from './sys.js'
export * from './tag.js'
export * from './asset'
export * from './asset-key'
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client'
export * from './collection'
export * from './concept-scheme'
export * from './concept'
export * from './content-type'
export * from './entry'
export * from './link'
export * from './locale'
export * from './metadata'
export * from './query/index'
export * from './resource-link'
export * from './space'
export * from './sync'
export * from './sys'
export * from './tag'
2 changes: 1 addition & 1 deletion lib/types/link.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ResourceLink } from './resource-link.js'
import { ResourceLink } from './resource-link'

/**
* @category Link
Expand Down
4 changes: 2 additions & 2 deletions lib/types/locale.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ContentfulCollection } from './collection.js'
import { BaseSys } from './sys.js'
import { ContentfulCollection } from './collection'
import { BaseSys } from './sys'

/**
* @category Entity
Expand Down
2 changes: 1 addition & 1 deletion lib/types/metadata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TagLink, TaxonomyConceptLink } from './link.js'
import { TagLink, TaxonomyConceptLink } from './link'

/**
* User-controlled metadata
Expand Down
4 changes: 2 additions & 2 deletions lib/types/query/equality.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'

type SupportedTypes =
| EntryFields.Symbol
Expand Down
6 changes: 3 additions & 3 deletions lib/types/query/existence.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EntryField, EntryFieldType } from '../entry.js'
import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util.js'
import { AssetDetails, AssetFile } from '../asset.js'
import { EntryField, EntryFieldType } from '../entry'
import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util'
import { AssetDetails, AssetFile } from '../asset'

/**
* Check for existence of provided fields
Expand Down
24 changes: 12 additions & 12 deletions lib/types/query/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ export {
EntrySkeletonType,
type ConditionalFixedQueries,
type ConditionalListQueries,
} from './util.js'
} from './util'

export * from './equality.js'
export * from './existence.js'
export * from './location.js'
export * from './order.js'
export * from './query.js'
export * from './range.js'
export * from './reference.js'
export * from './search.js'
export * from './select.js'
export * from './set.js'
export * from './subset.js'
export * from './equality'
export * from './existence'
export * from './location'
export * from './order'
export * from './query'
export * from './range'
export * from './reference'
export * from './search'
export * from './select'
export * from './set'
export * from './subset'
2 changes: 1 addition & 1 deletion lib/types/query/location.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ConditionalPick } from 'type-fest'
import { EntryFieldTypes } from '../entry.js'
import { EntryFieldTypes } from '../entry'

type Types = EntryFieldTypes.Location | undefined

Expand Down
8 changes: 4 additions & 4 deletions lib/types/query/order.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { EntrySkeletonType, FieldsType } from './util.js'
import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry.js'
import { AssetSys } from '../asset.js'
import { EntrySkeletonType, FieldsType } from './util'
import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry'
import { AssetSys } from '../asset'
import { ConditionalPick } from 'type-fest'
import { TagSys } from '../tag.js'
import { TagSys } from '../tag'

export type SupportedTypes =
| EntryFields.Symbol
Expand Down
34 changes: 17 additions & 17 deletions lib/types/query/query.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset.js'
import { ChainModifiers } from '../client.js'
import { EntrySys } from '../entry.js'
import { TagLink, TaxonomyConceptLink } from '../link.js'
import { Metadata } from '../metadata.js'
import { TagSys } from '../tag.js'
import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset'
import { ChainModifiers } from '../client'
import { EntrySys } from '../entry'
import { TagLink, TaxonomyConceptLink } from '../link'
import { Metadata } from '../metadata'
import { TagSys } from '../tag'
import {
EntryFieldsEqualityFilter,
EntryFieldsInequalityFilter,
EqualityFilter,
InequalityFilter,
} from './equality.js'
import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence.js'
import { LocationSearchFilters } from './location.js'
} from './equality'
import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence'
import { LocationSearchFilters } from './location'
import {
AssetOrderFilter,
TaxonomyOrderFilter,
EntryOrderFilter,
EntryOrderFilterWithFields,
TagOrderFilter,
} from './order.js'
import { EntryFieldsRangeFilters, RangeFilters } from './range.js'
import { ReferenceSearchFilters } from './reference.js'
import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search.js'
import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select.js'
import { EntryFieldsSetFilter } from './set.js'
import { EntryFieldsSubsetFilters, SubsetFilters } from './subset.js'
} from './order'
import { EntryFieldsRangeFilters, RangeFilters } from './range'
import { ReferenceSearchFilters } from './reference'
import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search'
import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select'
import { EntryFieldsSetFilter } from './set'
import { EntryFieldsSubsetFilters, SubsetFilters } from './subset'
import {
ConditionalFixedQueries,
ConditionalListQueries,
EntrySkeletonType,
FieldsType,
} from './util.js'
} from './util'

export type FixedPagedOptions = {
skip?: number
Expand Down
4 changes: 2 additions & 2 deletions lib/types/query/range.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'

type RangeFilterTypes = 'lt' | 'lte' | 'gt' | 'gte'

Expand Down
2 changes: 1 addition & 1 deletion lib/types/query/reference.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EntryFieldTypes } from '../entry.js'
import { EntryFieldTypes } from '../entry'
import { ConditionalPick } from 'type-fest'

type SupportedTypes =
Expand Down
4 changes: 2 additions & 2 deletions lib/types/query/search.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EntryFields, EntryFieldTypes } from '../entry.js'
import { ConditionalFixedQueries, FieldsType } from './util.js'
import { EntryFields, EntryFieldTypes } from '../entry'
import { ConditionalFixedQueries, FieldsType } from './util'

type SupportedTypes =
| EntryFields.Text
Expand Down
Loading