From 7b27d095e03cf38533bfda15f344a554474e34df Mon Sep 17 00:00:00 2001 From: Yurii Vlasiuk Date: Tue, 6 Dec 2022 20:56:16 +0200 Subject: [PATCH 1/2] update: exports with no shadowing --- src/context/index.js | 27 ++++----------------- src/entity/index.js | 54 ++++++++++------------------------------- src/utils/index.js | 57 ++++++++++---------------------------------- 3 files changed, 30 insertions(+), 108 deletions(-) diff --git a/src/context/index.js b/src/context/index.js index 1c59abec..f43f9b74 100644 --- a/src/context/index.js +++ b/src/context/index.js @@ -1,5 +1,5 @@ -import { JSONSchemaFormDataProvider } from "./json_schema_provider"; -import { +export { JSONSchemaFormDataProvider } from "./json_schema_provider"; +export { ApplicationContextMixin, JobContextMixin, MaterialContextMixin, @@ -8,27 +8,10 @@ import { MethodDataContextMixin, WorkflowContextMixin, } from "./mixins"; -import { JobContextPickKeysForMixin, WorkflowContextPickKeysForMixin } from "./pickers"; -import { ContextProvider } from "./provider"; -import { +export { JobContextPickKeysForMixin, WorkflowContextPickKeysForMixin } from "./pickers"; +export { ContextProvider } from "./provider"; +export { ContextProviderRegistryContainer, createAndPatchRegistry, extendAndPatchRegistry, } from "./registry"; - -export { - ContextProvider, - ContextProviderRegistryContainer, - extendAndPatchRegistry, - createAndPatchRegistry, - JobContextPickKeysForMixin, - JSONSchemaFormDataProvider, - WorkflowContextPickKeysForMixin, - ApplicationContextMixin, - MaterialContextMixin, - MaterialsContextMixin, - MaterialsSetContextMixin, - MethodDataContextMixin, - JobContextMixin, - WorkflowContextMixin, -}; diff --git a/src/entity/index.js b/src/entity/index.js index 99a336b9..f223daee 100644 --- a/src/entity/index.js +++ b/src/entity/index.js @@ -1,16 +1,16 @@ -import { InMemoryEntity } from "./in_memory"; -import { ContextAndRenderFieldsMixin } from "./mixins/context"; -import { RuntimeContextFieldMixin } from "./mixins/context_runtime"; -import { HashedInputArrayMixin } from "./mixins/hash"; -import { +export { InMemoryEntity } from "./in_memory"; +export { ContextAndRenderFieldsMixin } from "./mixins/context"; +export { RuntimeContextFieldMixin } from "./mixins/context_runtime"; +export { HashedInputArrayMixin } from "./mixins/hash"; +export { DefaultableMixin, HasDescriptionMixin, HasMetadataMixin, NamedEntityMixin, TaggableMixin, } from "./mixins/props"; -import { RuntimeItemsMixin } from "./mixins/runtime_items"; -import { +export { RuntimeItemsMixin } from "./mixins/runtime_items"; +export { DefaultableInMemoryEntity, HasMetadataNamedDefaultableInMemoryEntity, NamedDefaultableInMemoryEntity, @@ -19,40 +19,12 @@ import { NamedDefaultableRepetitionRuntimeItemsImportantSettingsContextAndRenderHashedInMemoryEntity, NamedInMemoryEntity, } from "./other"; -import { InMemoryEntitySet } from "./set"; -import { ENTITY_SET_TYPES } from "./set/enums"; -import { constructEntitySetFactoryByConfig } from "./set/factory"; -import { InMemoryEntityInSetMixin, InMemoryEntitySetMixin } from "./set/mixins"; -import { +export { InMemoryEntitySet } from "./set"; +export { ENTITY_SET_TYPES } from "./set/enums"; +export { constructEntitySetFactoryByConfig } from "./set/factory"; +export { InMemoryEntityInSetMixin, InMemoryEntitySetMixin } from "./set/mixins"; +export { OrderedInMemoryEntityInSetMixin, OrderedInMemoryEntitySetMixin, } from "./set/ordered/mixins"; -import * as selectorsForEntitySet from "./set/selectors"; - -export { - InMemoryEntity, - NamedInMemoryEntity, - DefaultableInMemoryEntity, - NamedDefaultableInMemoryEntity, - HasMetadataNamedDefaultableInMemoryEntity, - NamedDefaultableRepetitionContextAndRenderInMemoryEntity, - NamedDefaultableRepetitionImportantSettingsInMemoryEntity, - NamedDefaultableRepetitionRuntimeItemsImportantSettingsContextAndRenderHashedInMemoryEntity, - DefaultableMixin, - HasDescriptionMixin, - HasMetadataMixin, - TaggableMixin, - NamedEntityMixin, - RuntimeItemsMixin, - RuntimeContextFieldMixin, - HashedInputArrayMixin, - InMemoryEntitySet, - ENTITY_SET_TYPES, - constructEntitySetFactoryByConfig, - selectorsForEntitySet, - InMemoryEntitySetMixin, - InMemoryEntityInSetMixin, - OrderedInMemoryEntitySetMixin, - OrderedInMemoryEntityInSetMixin, - ContextAndRenderFieldsMixin, -}; +export * as selectorsForEntitySet from "./set/selectors"; diff --git a/src/utils/index.js b/src/utils/index.js index b03d0cee..86e01f24 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,15 +1,15 @@ -import { compareEntitiesInOrderedSetForSorting } from "../entity/set/ordered/utils"; -import { convertToCompactCSVArrayOfObjects, safeMakeArray } from "./array"; -import { cloneClass, extendClass, extendClassStaticProps, extendThis } from "./class"; -import { deepClone } from "./clone"; -import { refreshCodeMirror } from "./codemirror"; -import { formatFileSize, getProgrammingLanguageFromFileExtension } from "./file"; -import { +export { compareEntitiesInOrderedSetForSorting } from "../entity/set/ordered/utils"; +export { convertToCompactCSVArrayOfObjects, safeMakeArray } from "./array"; +export { cloneClass, extendClass, extendClassStaticProps, extendThis } from "./class"; +export { deepClone } from "./clone"; +export { refreshCodeMirror } from "./codemirror"; +export { formatFileSize, getProgrammingLanguageFromFileExtension } from "./file"; +export { calculateHashFromObject, calculateHashFromString, removeTimestampableKeysFromConfig, } from "./hash"; -import { +export { convertKeysToCamelCaseForObject, flattenObject, getOneMatchFromObject, @@ -18,8 +18,8 @@ import { sortKeysDeepForObject, stringifyObject, } from "./object"; -import { getSearchQuerySelector } from "./selector"; -import { +export { getSearchQuerySelector } from "./selector"; +export { convertArabicToRoman, randomAlphanumeric, removeCommentsFromSourceCode, @@ -27,38 +27,5 @@ import { removeNewLinesAndExtraSpaces, toFixedLocale, } from "./str"; -import { containsEncodedComponents } from "./url"; -import { getUUID } from "./uuid"; - -export { - compareEntitiesInOrderedSetForSorting, - safeMakeArray, - convertToCompactCSVArrayOfObjects, - cloneClass, - extendThis, - extendClass, - extendClassStaticProps, - deepClone, - refreshCodeMirror, - getOneMatchFromObject, - safeMakeObject, - convertKeysToCamelCaseForObject, - flattenObject, - renameKeysForObject, - sortKeysDeepForObject, - stringifyObject, - getProgrammingLanguageFromFileExtension, - formatFileSize, - calculateHashFromObject, - calculateHashFromString, - removeTimestampableKeysFromConfig, - removeNewLinesAndExtraSpaces, - randomAlphanumeric, - removeEmptyLinesFromString, - removeCommentsFromSourceCode, - toFixedLocale, - getUUID, - getSearchQuerySelector, - containsEncodedComponents, - convertArabicToRoman, -}; +export { containsEncodedComponents } from "./url"; +export { getUUID } from "./uuid"; From c357d1266e68e7a2274a7ad29a4eeac7cc49d05c Mon Sep 17 00:00:00 2001 From: Yurii Vlasiuk Date: Tue, 6 Dec 2022 20:58:49 +0200 Subject: [PATCH 2/2] update: package.json exports section --- package.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 86f343ac..016f0aad 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,12 @@ }, "main": "dist/index.js", "exports": { + ".": "./dist/index.js", "./context": "./dist/context/index.js", "./entity": "./dist/entity/index.js", "./utils": "./dist/utils/index.js", "./constants": "./dist/constants.js", - "./math": "./dist/math.js", - "./dist/context": "./dist/context/index.js", - "./dist/entity": "./dist/entity/index.js", - "./dist/utils": "./dist/utils/index.js", - "./dist/constants": "./dist/constants.js", - "./dist/math": "./dist/math.js" + "./math": "./dist/math.js" }, "files": [ "/dist",