fix: remove functions imported from devDep

aws-amplify · Jan 4, 2023 · d7544bd · d7544bd
1 parent 02b2dc2
commit d7544bd
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/codegen-ui-golden-files/package-lock.json b/packages/codegen-ui-golden-files/package-lock.json
diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/model-values.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/model-values.ts
@@ -21,7 +21,6 @@ import {
   ConcatenatedStudioComponentProperty,
 } from '@aws-amplify/codegen-ui';
 import { StudioFormInputFieldProperty } from '@aws-amplify/codegen-ui/lib/types/form/input-config';
-import { isEnumFieldType } from '@aws-amplify/datastore';
 import {
   Expression,
   factory,
@@ -44,7 +43,7 @@ import {
 } from '../../react-component-render-helper';
 import { buildAccessChain, getRecordsName } from './form-state';
 import { getElementAccessExpression, getValidProperty } from './invalid-variable-helpers';
-import { isModelDataType } from './render-checkers';
+import { isEnumDataType, isModelDataType } from './render-checkers';
 
 export const getDisplayValueObjectName = 'getDisplayValue';
 
@@ -450,7 +449,7 @@ export function buildDisplayValueFunction(fieldName: string, fieldConfig: FieldC
     }
   }
 
-  if (isEnumFieldType(fieldConfig.dataType) && fieldConfig.valueMappings && fieldConfig.isArray) {
+  if (isEnumDataType(fieldConfig) && fieldConfig.valueMappings && fieldConfig.isArray) {
     const displayValueMapName = `enumDisplayValueMap`;
     additionalStatements = [
       factory.createVariableStatement(

diff --git a/packages/codegen-ui-react/lib/forms/form-renderer-helper/render-checkers.ts b/packages/codegen-ui-react/lib/forms/form-renderer-helper/render-checkers.ts
@@ -14,7 +14,6 @@
   limitations under the License.
  */
 import { FieldConfigMetadata } from '@aws-amplify/codegen-ui';
-import { isEnumFieldType } from '@aws-amplify/datastore';
 
 export const shouldWrapInArrayField = (config: FieldConfigMetadata): boolean => config.isArray || !!config.relationship;
 
@@ -23,8 +22,13 @@ export const isModelDataType = (
 ): config is FieldConfigMetadata & { dataType: { model: string } } =>
   !!(config.dataType && typeof config.dataType === 'object' && 'model' in config.dataType);
 
+export const isEnumDataType = (
+  config: FieldConfigMetadata,
+): config is FieldConfigMetadata & { dataType: { enum: string } } =>
+  !!(config.dataType && typeof config.dataType === 'object' && 'enum' in config.dataType);
+
 export const shouldImplementDisplayValueFunction = (config: FieldConfigMetadata): boolean => {
-  return isModelDataType(config) || (isEnumFieldType(config.dataType) && shouldWrapInArrayField(config));
+  return isModelDataType(config) || (isEnumDataType(config) && shouldWrapInArrayField(config));
 };
 
 export const shouldImplementIDValueFunction = (config: FieldConfigMetadata): boolean => {

diff --git a/packages/codegen-ui-react/package-lock.json b/packages/codegen-ui-react/package-lock.json
diff --git a/packages/codegen-ui/lib/utils/form-component-metadata.ts b/packages/codegen-ui/lib/utils/form-component-metadata.ts
@@ -13,7 +13,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-import { isEnumFieldType } from '@aws-amplify/datastore';
 import { camelCase } from 'change-case';
 
 import {
@@ -93,7 +92,11 @@ export const mapFormMetadata = (form: StudioForm, formDefinition: FormDefinition
           });
         }
 
-        if ((element.relationship || isEnumFieldType(element.dataType)) && 'valueMappings' in element) {
+        if (
+          (element.relationship ||
+            (element.dataType && typeof element.dataType === 'object' && 'enum' in element.dataType)) &&
+          'valueMappings' in element
+        ) {
           metadata.valueMappings = element.valueMappings;
         }
 

diff --git a/packages/codegen-ui/package-lock.json b/packages/codegen-ui/package-lock.json
diff --git a/packages/test-generator/package-lock.json b/packages/test-generator/package-lock.json