@aws-amplify/amplify-util-uibuilder 1.6.19-gfix.0 → 1.7.0-mock-fix.0

package/lib/utils/prePushHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prePushHandler.d.ts","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAU9C,eAAO,MAAM,cAAc,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAmBtE,CAAC"}
+{"version":3,"file":"prePushHandler.d.ts","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAU3D,eAAO,MAAM,cAAc,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAmBtE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.6.19-gfix.0",
+  "version": "1.7.0-mock-fix.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,11 +14,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-prompts": "2.6.13-gfix.0",
-    "@aws-amplify/codegen-ui": "2.11.0",
-    "@aws-amplify/codegen-ui-react": "2.11.0",
-    "amplify-cli-core": "4.0.8-gfix.0",
-    "amplify-codegen": "^3.4.0",
+    "@aws-amplify/amplify-cli-core": "4.0.2-mock-fix.0",
+    "@aws-amplify/amplify-prompts": "2.6.7-mock-fix.0",
+    "@aws-amplify/codegen-ui": "2.11.1",
+    "@aws-amplify/codegen-ui-react": "2.11.1",
+    "amplify-codegen": "^3.4.1",
     "aws-sdk": "^2.1233.0",
     "fs-extra": "^8.1.0",
     "ora": "^4.0.3",
@@ -73,5 +73,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "e942a6ea47168650c4e9bc2619ce7d7372f507dd"
+  "gitHead": "0714aae4d666060bcd03ed481943f262eb07762a"
 }

package/src/__tests__/cloneComponentsFromEnv.test.ts

@@ -9,7 +9,7 @@ jest.mock('../commands/utils/featureFlags', () => ({
   getTransformerVersion: jest.fn().mockReturnValue(2),
 }));
 jest.mock('../commands/utils/extractArgs');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 const mockedComponentExport = jest.fn((envName: string) => {
   if (envName === 'newEnvName') {
@@ -53,6 +53,10 @@ describe('can clone components to new environment', () => {
           features: {
             autoGenerateForms: 'true',
             autoGenerateViews: 'true',
+            formFeatureFlags: {
+              isRelationshipSupported: 'false',
+              isNonModelSupported: 'false',
+            },
           },
         }),
       }),

package/src/__tests__/generateComponents.test.ts

@@ -3,7 +3,7 @@ import * as utils from '../commands/utils';
 import { run } from '../commands/generateComponents';
 
 jest.mock('../commands/utils');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 const awsMock = aws as any;
 const utilsMock = utils as any;
 
@@ -69,6 +69,10 @@ describe('can generate components', () => {
           features: {
             autoGenerateForms: 'true',
             autoGenerateViews: 'true',
+            formFeatureFlags: {
+              isRelationshipSupported: 'false',
+              isNonModelSupported: 'false',
+            },
           },
         }),
       }),

package/src/__tests__/help.test.ts

@@ -1,4 +1,4 @@
-jest.mock('amplify-prompts');
+jest.mock('@aws-amplify/amplify-prompts');
 import { printer } from '@aws-amplify/amplify-prompts';
 import { run } from '../commands/help';
 printer.info = jest.fn();

package/src/__tests__/notifyMissingPackages.test.ts

@@ -1,9 +1,9 @@
 import * as printerDependency from '@aws-amplify/amplify-prompts';
-import * as JSONUtilitiesDependency from 'amplify-cli-core';
+import * as JSONUtilitiesDependency from '@aws-amplify/amplify-cli-core';
 import { notifyMissingPackages } from '../commands/utils/notifyMissingPackages';
-import { $TSContext } from 'amplify-cli-core';
-jest.mock('amplify-prompts');
-jest.mock('amplify-cli-core');
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
+jest.mock('@aws-amplify/amplify-prompts');
+jest.mock('@aws-amplify/amplify-cli-core');
 printerDependency.printer.info = jest.fn();
 printerDependency.printer.debug = jest.fn();
 printerDependency.printer.warn = jest.fn();
@@ -59,7 +59,7 @@ describe('should notify when packages are missing', () => {
   it('notifies for partial missing dependencies', async () => {
     JSONUtilitiesDependency.JSONUtilities.readJson = jest.fn().mockImplementation(() => ({
       projectPath: __dirname,
-      dependencies: { '@aws-amplify/ui-react': '4.2.0' },
+      dependencies: { '@aws-amplify/ui-react': '4.4.2' },
     }));
     const context = {
       input: {

package/src/__tests__/prePushHandler.test.ts

@@ -1,4 +1,4 @@
-// aws-sdk, amplify-cli-core, amplify-prompts are in package dependencies
+// aws-sdk, @aws-amplify/amplify-cli-core, amplify-prompts are in package dependencies
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
 import { Form } from 'aws-sdk/clients/amplifyuibuilder'; // eslint-disable-line import/no-extraneous-dependencies
 import { printer } from '@aws-amplify/amplify-prompts'; // eslint-disable-line import/no-extraneous-dependencies
@@ -6,7 +6,7 @@ import * as utils from '../commands/utils';
 import { prePushHandler } from '../utils/prePushHandler';
 
 jest.mock('../commands/utils');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../commands/utils/featureFlags', () => ({
   getTransformerVersion: jest.fn().mockImplementation(() => 2),
 }));
@@ -80,6 +80,10 @@ describe('handlePrePush', () => {
           features: {
             autoGenerateForms: 'true',
             autoGenerateViews: 'true',
+            formFeatureFlags: {
+              isRelationshipSupported: 'false',
+              isNonModelSupported: 'false',
+            },
           },
         })),
       })),

package/src/__tests__/shouldRenderComponents.test.ts

@@ -1,12 +1,12 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
 import { shouldRenderComponents } from '../commands/utils/shouldRenderComponents';
 
 const awsMock = aws as any;
 
-jest.mock('amplify-cli-core', () => ({
-  ...jest.requireActual('amplify-cli-core'),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...jest.requireActual('@aws-amplify/amplify-cli-core'),
   stateManager: {
     getProjectConfig: jest.fn().mockReturnValue({
       providers: ['awscloudformation'],
@@ -35,6 +35,10 @@ describe('should render components', () => {
           features: {
             autoGenerateForms: 'true',
             autoGenerateViews: 'true',
+            formFeatureFlags: {
+              isRelationshipSupported: 'false',
+              isNonModelSupported: 'false',
+            },
           },
         })),
       })),
@@ -62,7 +66,7 @@ describe('should render components', () => {
   });
 
   it("doesn't work if provider is not awscloudformation", async () => {
-    jest.mock('amplify-cli-core', () => ({
+    jest.mock('@aws-amplify/amplify-cli-core', () => ({
       stateManager: {
         getProjectConfig: jest.fn().mockReturnValue({
           providers: [],
@@ -78,7 +82,7 @@ describe('should render components', () => {
   });
 
   it('should return false if frontend is ios', async () => {
-    jest.mock('amplify-cli-core', () => ({
+    jest.mock('@aws-amplify/amplify-cli-core', () => ({
       stateManager: {
         getProjectConfig: jest.fn().mockReturnValue({
           providers: [],
@@ -91,7 +95,7 @@ describe('should render components', () => {
   });
 
   it('should return false if frontend is vue', async () => {
-    jest.mock('amplify-cli-core', () => ({
+    jest.mock('@aws-amplify/amplify-cli-core', () => ({
       stateManager: {
         getProjectConfig: jest.fn().mockReturnValue({
           providers: [],

package/src/__tests__/syncAmplifyUiComponents.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable spellcheck/spell-checker */
-import { AmplifyCategories, AmplifySupportedService, stateManager } from 'amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
+import { AmplifyCategories, AmplifySupportedService, stateManager } from '@aws-amplify/amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
 import {
   generateUiBuilderComponents,
@@ -13,8 +13,8 @@ import { AmplifyStudioClient } from '../clients';
 import * as createUiBuilderComponentDependency from '../commands/utils/codegenResources';
 import { exampleSchema } from './utils';
 
-jest.mock('amplify-cli-core', () => ({
-  ...jest.requireActual('amplify-cli-core'),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...jest.requireActual('@aws-amplify/amplify-cli-core'),
   FeatureFlags: {
     getBoolean: () => false,
     getNumber: () => 0,
@@ -139,6 +139,10 @@ describe('should sync amplify ui builder components', () => {
           features: {
             autoGenerateForms: 'true',
             autoGenerateViews: 'true',
+            formFeatureFlags: {
+              isRelationshipSupported: 'false',
+              isNonModelSupported: 'false',
+            },
           },
         })),
       })),
@@ -179,6 +183,10 @@ describe('should sync amplify ui builder components', () => {
       expect.objectContaining({
         autoGenerateForms: true,
         autoGenerateViews: true,
+        formFeatureFlags: {
+          isRelationshipSupported: false,
+          isNonModelSupported: false,
+        },
       }),
     );
   });

package/src/__tests__/version.test.ts

@@ -1,6 +1,6 @@
 import { printer } from '@aws-amplify/amplify-prompts';
 import { run } from '../commands/version';
-jest.mock('amplify-prompts');
+jest.mock('@aws-amplify/amplify-prompts');
 printer.info = jest.fn();
 describe('can run version script', () => {
   it('runs version script', async () => {

package/src/clients/amplify-studio-client.ts

@@ -1,4 +1,4 @@
-import { $TSContext, CloudformationProviderFacade } from 'amplify-cli-core';
+import { $TSContext, CloudformationProviderFacade } from '@aws-amplify/amplify-cli-core';
 import type { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
 import type { CreateComponentData, Component, Theme, Form } from 'aws-sdk/clients/amplifyuibuilder';
 import { AmplifyUIBuilder, AmplifyBackend } from 'aws-sdk';
@@ -12,6 +12,10 @@ import { getTransformerVersion } from '../commands/utils/featureFlags';
 export type StudioMetadata = {
   autoGenerateForms: boolean;
   autoGenerateViews: boolean;
+  formFeatureFlags: {
+    isRelationshipSupported: boolean;
+    isNonModelSupported: boolean;
+  };
 };
 
 /**
@@ -107,6 +111,10 @@ export default class AmplifyStudioClient {
     this.metadata = {
       autoGenerateForms: false,
       autoGenerateViews: false,
+      formFeatureFlags: {
+        isRelationshipSupported: false,
+        isNonModelSupported: false,
+      },
     };
   }
 
@@ -126,6 +134,10 @@ export default class AmplifyStudioClient {
       this.metadata = {
         autoGenerateForms: response.features?.autoGenerateForms === 'true',
         autoGenerateViews: response.features?.autoGenerateViews === 'true',
+        formFeatureFlags: {
+          isRelationshipSupported: response.features?.isRelationshipSupported === 'true',
+          isNonModelSupported: response.features?.isNonModelSupported === 'true',
+        },
       };
     } catch (err) {
       throw new Error(`Failed to load metadata: ${err.message}`);

package/src/commands/cloneComponentsFromEnv.ts

@@ -1,5 +1,5 @@
 import { printer } from '@aws-amplify/amplify-prompts';
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { extractArgs } from './utils';
 import { AmplifyStudioClient } from '../clients';
 

package/src/commands/generateComponents.ts

@@ -2,7 +2,7 @@
 import { StudioSchema } from '@aws-amplify/codegen-ui';
 import ora from 'ora';
 import { printer } from '@aws-amplify/amplify-prompts';
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { AmplifyStudioClient } from '../clients';
 import {
   notifyMissingPackages,
@@ -51,6 +51,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
         formSchemas.entities,
         dataSchema,
         studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported,
+        studioClient.metadata.formFeatureFlags,
       ),
     };
 

package/src/commands/utils/codegenResources.ts

@@ -12,6 +12,7 @@ import {
   getGenericFromDataStore,
   StudioForm,
   StudioSchema,
+  FormFeatureFlags,
 } from '@aws-amplify/codegen-ui';
 import {
   AmplifyRenderer,
@@ -26,7 +27,7 @@ import {
   ReactThemeStudioTemplateRendererOptions,
 } from '@aws-amplify/codegen-ui-react';
 import { printer } from '@aws-amplify/amplify-prompts';
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
 import { ModelIntrospectionSchema } from '@aws-amplify/appsync-modelgen-plugin';
 
@@ -95,11 +96,16 @@ export const createUiBuilderTheme = (
 /**
  * Writes form file to the work space
  */
-export const createUiBuilderForm = (context: $TSContext, schema: StudioForm, dataSchema?: GenericDataSchema): StudioForm => {
+export const createUiBuilderForm = (
+  context: $TSContext,
+  schema: StudioForm,
+  dataSchema?: GenericDataSchema,
+  formFeatureFlags?: FormFeatureFlags,
+): StudioForm => {
   const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
   const rendererFactory = new StudioTemplateRendererFactory(
     (form: StudioForm) =>
-      new AmplifyFormRenderer(form, dataSchema, config) as unknown as StudioTemplateRenderer<
+      new AmplifyFormRenderer(form, dataSchema, config, formFeatureFlags) as unknown as StudioTemplateRenderer<
         unknown,
         StudioForm,
         FrameworkOutputManager<unknown>,

package/src/commands/utils/environmentHelpers.ts

@@ -1,4 +1,4 @@
-import { $TSContext, stateManager } from 'amplify-cli-core';
+import { $TSContext, stateManager } from '@aws-amplify/amplify-cli-core';
 import { extractArgs } from './extractArgs';
 
 /**

package/src/commands/utils/extractArgs.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 
 export const extractArgs = (context: $TSContext) => {
   if (!context.input.options) {

package/src/commands/utils/featureFlags.ts

@@ -1,5 +1,5 @@
 /* eslint-disable spellcheck/spell-checker */
-import { FeatureFlags, pathManager, stateManager } from 'amplify-cli-core';
+import { FeatureFlags, pathManager, stateManager } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 
 // This is copy-pasta from the category api until they can expose the method to plugins

package/src/commands/utils/getUiBuilderComponentsPath.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import fs from 'fs-extra';
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { extractArgs } from './extractArgs';
 
 /**

package/src/commands/utils/notifyMissingPackages.ts

@@ -1,4 +1,4 @@
-import { pathManager, JSONUtilities, $TSContext, $TSAny } from 'amplify-cli-core';
+import { pathManager, JSONUtilities, $TSContext, $TSAny } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import fs from 'fs-extra';
 import path from 'path';

package/src/commands/utils/shouldRenderComponents.ts

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-arrow/prefer-arrow-functions */
-import { $TSContext, stateManager } from 'amplify-cli-core';
+import { $TSContext, stateManager } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { AmplifyStudioClient } from '../../clients';
 import { getAppId } from './environmentHelpers';

package/src/commands/utils/syncAmplifyUiBuilderComponents.ts

@@ -1,6 +1,14 @@
 import { printer } from '@aws-amplify/amplify-prompts';
-import { $TSContext } from 'amplify-cli-core';
-import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema, checkIsSupportedAsForm } from '@aws-amplify/codegen-ui';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
+import {
+  StudioComponent,
+  StudioTheme,
+  GenericDataSchema,
+  StudioForm,
+  StudioSchema,
+  checkIsSupportedAsForm,
+  FormFeatureFlags,
+} from '@aws-amplify/codegen-ui';
 import { createUiBuilderComponent, createUiBuilderForm, createUiBuilderTheme, generateBaseForms } from './codegenResources';
 import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
 
@@ -95,18 +103,19 @@ export const generateUiBuilderForms = (
   formSchemas: any[],
   dataSchema?: GenericDataSchema,
   autoGenerateForms?: boolean,
+  formFeatureFlags?: FormFeatureFlags,
 ): CodegenResponse<StudioForm>[] => {
   const modelMap: { [model: string]: Set<'create' | 'update'> } = {};
   if (dataSchema?.dataSourceType === 'DataStore' && autoGenerateForms) {
     Object.entries(dataSchema.models).forEach(([name, model]) => {
-      if (checkIsSupportedAsForm(model) && !model.isJoinTable) {
+      if (checkIsSupportedAsForm(model, formFeatureFlags) && !model.isJoinTable) {
         modelMap[name] = new Set(['create', 'update']);
       }
     });
   }
   const codegenForm = (schema: StudioForm): CodegenResponse<StudioForm> => {
     try {
-      const form = createUiBuilderForm(context, schema, dataSchema);
+      const form = createUiBuilderForm(context, schema, dataSchema, formFeatureFlags);
       return { resultType: 'SUCCESS', schema: form };
     } catch (e) {
       printer.debug(`Failure caught processing ${schema.name}`);

package/src/event-handlers/handle-PostEnvAdd.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { run as cloneComponentsFromEnv } from '../commands/cloneComponentsFromEnv';
 

package/src/event-handlers/handle-PostPull.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { run as generateComponents } from '../commands/generateComponents';
 

package/src/event-handlers/handle-PostPush.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { run as generateComponents } from '../commands/generateComponents';
 

package/src/event-handlers/handle-PrePush.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { prePushHandler } from '../utils/prePushHandler';
 

package/src/index.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import path from 'path';
 
 // TODO: remove dynamic require

package/src/utils/prePushHandler.ts

@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import AmplifyUIBuilder from 'aws-sdk/clients/amplifyuibuilder';
 import { AmplifyStudioClient } from '../clients';