Skip to content

Commit 4bd5a84

Browse files
axe312geraxe312ger
committed
refactor: remove no more needed .js from imports
1 parent 0203e54 commit 4bd5a84

36 files changed

+151
-154
lines changed

‎lib/contentful.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ import axios from 'axios'
77
import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'
88

99
import { createHttpClient, getUserAgentHeader } from 'contentful-sdk-core'
10-
import { createGlobalOptions } from './create-global-options.js'
11-
import { makeClient } from './make-client.js'
12-
import {
13-
validateRemoveUnresolvedParam,
14-
validateResolveLinksParam,
15-
} from './utils/validate-params.js'
16-
import type { ContentfulClientApi } from './types/client.js'
10+
import { createGlobalOptions } from './create-global-options'
11+
import { makeClient } from './make-client'
12+
import { validateRemoveUnresolvedParam, validateResolveLinksParam } from './utils/validate-params'
13+
import type { ContentfulClientApi } from './types/client'
1714

1815
/**
1916
* @category Client

‎lib/create-contentful-api.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import { encodeCPAResponse } from '@contentful/content-source-maps'
77
import { AxiosInstance, createRequestConfig, errorHandler } from 'contentful-sdk-core'
8-
import { CreateClientParams } from './contentful.js'
9-
import { GetGlobalOptions } from './create-global-options.js'
10-
import pagedSync from './paged-sync.js'
8+
import { CreateClientParams } from './contentful'
9+
import { GetGlobalOptions } from './create-global-options'
10+
import pagedSync from './paged-sync'
1111
import type {
1212
Asset,
1313
AssetCollection,
@@ -28,20 +28,20 @@ import type {
2828
Concept,
2929
ConceptScheme,
3030
ConceptSchemeCollection,
31-
} from './types/index.js'
32-
import normalizeSearchParameters from './utils/normalize-search-parameters.js'
33-
import normalizeSelect from './utils/normalize-select.js'
34-
import resolveCircular from './utils/resolve-circular.js'
35-
import getQuerySelectionSet from './utils/query-selection-set.js'
36-
import validateTimestamp from './utils/validate-timestamp.js'
37-
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
31+
} from './types/index'
32+
import normalizeSearchParameters from './utils/normalize-search-parameters'
33+
import normalizeSelect from './utils/normalize-select'
34+
import resolveCircular from './utils/resolve-circular'
35+
import getQuerySelectionSet from './utils/query-selection-set'
36+
import validateTimestamp from './utils/validate-timestamp'
37+
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
3838
import {
3939
checkIncludeContentSourceMapsParamIsAllowed,
4040
validateLocaleParam,
4141
validateRemoveUnresolvedParam,
4242
validateResolveLinksParam,
43-
} from './utils/validate-params.js'
44-
import validateSearchParameters from './utils/validate-search-parameters.js'
43+
} from './utils/validate-params'
44+
import validateSearchParameters from './utils/validate-search-parameters'
4545

4646
const ASSET_KEY_MAX_LIFETIME = 48 * 60 * 60
4747

‎lib/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export * from './contentful.js'
2-
export * from './create-global-options.js'
3-
export * from './mixins/stringify-safe.js'
4-
export * from './utils/normalize-select.js'
5-
export * from './utils/resolve-circular.js'
1+
export * from './contentful'
2+
export * from './create-global-options'
3+
export * from './mixins/stringify-safe'
4+
export * from './utils/normalize-select'
5+
export * from './utils/resolve-circular'
66

7-
export * from './types/index.js'
7+
export * from './types/index'

‎lib/make-client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api.js'
1+
import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api'
22
import {
33
ChainOptions,
44
DefaultChainOption,
55
ChainOption,
66
ModifiersFromOptions,
7-
} from './utils/client-helpers.js'
8-
import type { ContentfulClientApi } from './types/index.js'
7+
} from './utils/client-helpers'
8+
import type { ContentfulClientApi } from './types/index'
99

1010
function create<OptionsType extends ChainOptions>(
1111
{ http, getGlobalOptions }: CreateContentfulApiParams,

‎lib/paged-sync.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import resolveResponse from 'contentful-resolve-response'
22
import { AxiosInstance, createRequestConfig, freezeSys, toPlainObject } from 'contentful-sdk-core'
3-
import mixinStringifySafe from './mixins/stringify-safe.js'
3+
import mixinStringifySafe from './mixins/stringify-safe'
44
import type {
55
SyncPageQuery,
66
SyncResponse,
@@ -11,8 +11,8 @@ import type {
1111
SyncQuery,
1212
LocaleCode,
1313
EntrySkeletonType,
14-
} from './types/index.js'
15-
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
14+
} from './types/index'
15+
import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
1616

1717
/**
1818
* Retrieves all the available pages for a sync operation

‎lib/types/asset.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { ContentfulCollection } from './collection.js'
2-
import { LocaleCode } from './locale.js'
3-
import { Metadata } from './metadata.js'
4-
import { EntitySys } from './sys.js'
5-
import { ChainModifiers } from './client.js'
1+
import { ContentfulCollection } from './collection'
2+
import { LocaleCode } from './locale'
3+
import { Metadata } from './metadata'
4+
import { EntitySys } from './sys'
5+
import { ChainModifiers } from './client'
66

77
/**
88
* @category Asset

‎lib/types/client.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ContentType, ContentTypeCollection } from './content-type.js'
2-
import { Space } from './space.js'
3-
import { LocaleCode, LocaleCollection } from './locale.js'
1+
import { ContentType, ContentTypeCollection } from './content-type'
2+
import { Space } from './space'
3+
import { LocaleCode, LocaleCollection } from './locale'
44
import {
55
AssetQueries,
66
AssetsQueries,
@@ -10,14 +10,14 @@ import {
1010
EntryQueries,
1111
EntrySkeletonType,
1212
TagQueries,
13-
} from './query/index.js'
14-
import { SyncCollection, SyncOptions, SyncQuery } from './sync.js'
15-
import { Tag, TagCollection } from './tag.js'
16-
import { AssetKey } from './asset-key.js'
17-
import { Entry, EntryCollection } from './entry.js'
18-
import { Asset, AssetCollection, AssetFields } from './asset.js'
19-
import { Concept, ConceptCollection } from './concept.js'
20-
import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme.js'
13+
} from './query/index'
14+
import { SyncCollection, SyncOptions, SyncQuery } from './sync'
15+
import { Tag, TagCollection } from './tag'
16+
import { AssetKey } from './asset-key'
17+
import { Entry, EntryCollection } from './entry'
18+
import { Asset, AssetCollection, AssetFields } from './asset'
19+
import { Concept, ConceptCollection } from './concept'
20+
import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme'
2121

2222
/**
2323
* Client chain modifiers used in all types that depend on the client configuration.

‎lib/types/collection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { AssetSys } from './asset.js'
2-
import { EntrySys } from './entry.js'
1+
import { AssetSys } from './asset'
2+
import { EntrySys } from './entry'
33

44
/**
55
* A wrapper object containing additional information for

‎lib/types/content-type.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { ContentfulCollection } from './collection.js'
2-
import { EntryFields } from './entry.js'
3-
import { SpaceLink, EnvironmentLink } from './link.js'
4-
import { BaseSys } from './sys.js'
1+
import { ContentfulCollection } from './collection'
2+
import { EntryFields } from './entry'
3+
import { SpaceLink, EnvironmentLink } from './link'
4+
import { BaseSys } from './sys'
55
import type { BLOCKS, INLINES } from '@contentful/rich-text-types'
66

77
/**

‎lib/types/entry.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Document as RichTextDocument } from '@contentful/rich-text-types'
2-
import { Asset } from './asset.js'
3-
import { ContentfulCollection } from './collection.js'
4-
import { ContentTypeLink, UnresolvedLink } from './link.js'
5-
import { LocaleCode } from './locale.js'
6-
import { Metadata } from './metadata.js'
7-
import { EntrySkeletonType } from './query/index.js'
8-
import { EntitySys } from './sys.js'
2+
import { Asset } from './asset'
3+
import { ContentfulCollection } from './collection'
4+
import { ContentTypeLink, UnresolvedLink } from './link'
5+
import { LocaleCode } from './locale'
6+
import { Metadata } from './metadata'
7+
import { EntrySkeletonType } from './query/index'
8+
import { EntitySys } from './sys'
99
import { JsonArray, JsonObject } from 'type-fest'
10-
import { ResourceLink } from './resource-link.js'
11-
import { ChainModifiers } from './client.js'
10+
import { ResourceLink } from './resource-link'
11+
import { ChainModifiers } from './client'
1212

1313
/**
1414
* System managed metadata for entries

‎lib/types/index.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
export * from './asset.js'
2-
export * from './asset-key.js'
3-
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client.js'
4-
export * from './collection.js'
5-
export * from './concept-scheme.js'
6-
export * from './concept.js'
7-
export * from './content-type.js'
8-
export * from './entry.js'
9-
export * from './link.js'
10-
export * from './locale.js'
11-
export * from './metadata.js'
12-
export * from './query/index.js'
13-
export * from './resource-link.js'
14-
export * from './space.js'
15-
export * from './sync.js'
16-
export * from './sys.js'
17-
export * from './tag.js'
1+
export * from './asset'
2+
export * from './asset-key'
3+
export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client'
4+
export * from './collection'
5+
export * from './concept-scheme'
6+
export * from './concept'
7+
export * from './content-type'
8+
export * from './entry'
9+
export * from './link'
10+
export * from './locale'
11+
export * from './metadata'
12+
export * from './query/index'
13+
export * from './resource-link'
14+
export * from './space'
15+
export * from './sync'
16+
export * from './sys'
17+
export * from './tag'

‎lib/types/link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ResourceLink } from './resource-link.js'
1+
import { ResourceLink } from './resource-link'
22

33
/**
44
* @category Link

‎lib/types/locale.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ContentfulCollection } from './collection.js'
2-
import { BaseSys } from './sys.js'
1+
import { ContentfulCollection } from './collection'
2+
import { BaseSys } from './sys'
33

44
/**
55
* @category Entity

‎lib/types/metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TagLink, TaxonomyConceptLink } from './link.js'
1+
import { TagLink, TaxonomyConceptLink } from './link'
22

33
/**
44
* User-controlled metadata

‎lib/types/query/equality.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
2-
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
1+
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
2+
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'
33

44
type SupportedTypes =
55
| EntryFields.Symbol

‎lib/types/query/existence.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { EntryField, EntryFieldType } from '../entry.js'
2-
import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util.js'
3-
import { AssetDetails, AssetFile } from '../asset.js'
1+
import { EntryField, EntryFieldType } from '../entry'
2+
import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util'
3+
import { AssetDetails, AssetFile } from '../asset'
44

55
/**
66
* Check for existence of provided fields

‎lib/types/query/index.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ export {
33
EntrySkeletonType,
44
type ConditionalFixedQueries,
55
type ConditionalListQueries,
6-
} from './util.js'
6+
} from './util'
77

8-
export * from './equality.js'
9-
export * from './existence.js'
10-
export * from './location.js'
11-
export * from './order.js'
12-
export * from './query.js'
13-
export * from './range.js'
14-
export * from './reference.js'
15-
export * from './search.js'
16-
export * from './select.js'
17-
export * from './set.js'
18-
export * from './subset.js'
8+
export * from './equality'
9+
export * from './existence'
10+
export * from './location'
11+
export * from './order'
12+
export * from './query'
13+
export * from './range'
14+
export * from './reference'
15+
export * from './search'
16+
export * from './select'
17+
export * from './set'
18+
export * from './subset'

‎lib/types/query/location.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ConditionalPick } from 'type-fest'
2-
import { EntryFieldTypes } from '../entry.js'
2+
import { EntryFieldTypes } from '../entry'
33

44
type Types = EntryFieldTypes.Location | undefined
55

‎lib/types/query/order.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { EntrySkeletonType, FieldsType } from './util.js'
2-
import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry.js'
3-
import { AssetSys } from '../asset.js'
1+
import { EntrySkeletonType, FieldsType } from './util'
2+
import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry'
3+
import { AssetSys } from '../asset'
44
import { ConditionalPick } from 'type-fest'
5-
import { TagSys } from '../tag.js'
5+
import { TagSys } from '../tag'
66

77
export type SupportedTypes =
88
| EntryFields.Symbol

‎lib/types/query/query.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset.js'
2-
import { ChainModifiers } from '../client.js'
3-
import { EntrySys } from '../entry.js'
4-
import { TagLink, TaxonomyConceptLink } from '../link.js'
5-
import { Metadata } from '../metadata.js'
6-
import { TagSys } from '../tag.js'
1+
import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset'
2+
import { ChainModifiers } from '../client'
3+
import { EntrySys } from '../entry'
4+
import { TagLink, TaxonomyConceptLink } from '../link'
5+
import { Metadata } from '../metadata'
6+
import { TagSys } from '../tag'
77
import {
88
EntryFieldsEqualityFilter,
99
EntryFieldsInequalityFilter,
1010
EqualityFilter,
1111
InequalityFilter,
12-
} from './equality.js'
13-
import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence.js'
14-
import { LocationSearchFilters } from './location.js'
12+
} from './equality'
13+
import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence'
14+
import { LocationSearchFilters } from './location'
1515
import {
1616
AssetOrderFilter,
1717
TaxonomyOrderFilter,
1818
EntryOrderFilter,
1919
EntryOrderFilterWithFields,
2020
TagOrderFilter,
21-
} from './order.js'
22-
import { EntryFieldsRangeFilters, RangeFilters } from './range.js'
23-
import { ReferenceSearchFilters } from './reference.js'
24-
import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search.js'
25-
import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select.js'
26-
import { EntryFieldsSetFilter } from './set.js'
27-
import { EntryFieldsSubsetFilters, SubsetFilters } from './subset.js'
21+
} from './order'
22+
import { EntryFieldsRangeFilters, RangeFilters } from './range'
23+
import { ReferenceSearchFilters } from './reference'
24+
import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search'
25+
import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select'
26+
import { EntryFieldsSetFilter } from './set'
27+
import { EntryFieldsSubsetFilters, SubsetFilters } from './subset'
2828
import {
2929
ConditionalFixedQueries,
3030
ConditionalListQueries,
3131
EntrySkeletonType,
3232
FieldsType,
33-
} from './util.js'
33+
} from './util'
3434

3535
export type FixedPagedOptions = {
3636
skip?: number

‎lib/types/query/range.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
2-
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
1+
import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
2+
import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'
33

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

‎lib/types/query/reference.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EntryFieldTypes } from '../entry.js'
1+
import { EntryFieldTypes } from '../entry'
22
import { ConditionalPick } from 'type-fest'
33

44
type SupportedTypes =

‎lib/types/query/search.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { EntryFields, EntryFieldTypes } from '../entry.js'
2-
import { ConditionalFixedQueries, FieldsType } from './util.js'
1+
import { EntryFields, EntryFieldTypes } from '../entry'
2+
import { ConditionalFixedQueries, FieldsType } from './util'
33

44
type SupportedTypes =
55
| EntryFields.Text

0 commit comments

Comments
 (0)