@aws-amplify/amplify-util-uibuilder 1.2.16-pin-codegen-dependency.0 → 1.2.16

package/src/commands/utils/createUiBuilderComponentNew.ts

@@ -0,0 +1,53 @@
+import { StudioTemplateRendererManager, StudioTemplateRendererFactory, StudioComponent, StudioTheme, StudioTemplateRenderer, FrameworkOutputManager, RenderTextComponentResponse } from '@aws-amplify/codegen-ui-new';
+import {
+  AmplifyRenderer,
+  ReactThemeStudioTemplateRenderer,
+  ReactIndexStudioTemplateRenderer,
+  ModuleKind,
+  ScriptTarget,
+  ScriptKind,
+} from '@aws-amplify/codegen-ui-react-new';
+import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
+import { printer } from 'amplify-prompts';
+import { $TSContext } from 'amplify-cli-core';
+const config = {
+  module: ModuleKind.ES2020,
+  target: ScriptTarget.ES2020,
+  script: ScriptKind.JSX,
+  renderTypeDeclarations: true,
+};
+
+export const createUiBuilderComponent = (context: $TSContext, schema: StudioComponent) => {
+  const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
+  const rendererFactory = new StudioTemplateRendererFactory((component: StudioComponent) => new AmplifyRenderer(component, config) as unknown as StudioTemplateRenderer<unknown, StudioComponent, FrameworkOutputManager<unknown>, RenderTextComponentResponse>);
+
+  const outputPathDir = uiBuilderComponentsPath;
+
+  const rendererManager = new StudioTemplateRendererManager(rendererFactory, {
+    outputPathDir,
+  });
+
+  rendererManager.renderSchemaToTemplate(schema);
+  return schema;
+};
+
+export const createUiBuilderTheme = (context: $TSContext, schema: StudioTheme) => {
+  const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
+  const rendererFactory = new StudioTemplateRendererFactory((component: StudioTheme) => new ReactThemeStudioTemplateRenderer(component, config) as unknown as StudioTemplateRenderer<unknown, StudioTheme, FrameworkOutputManager<unknown>, RenderTextComponentResponse>);
+
+  const outputPathDir = uiBuilderComponentsPath;
+
+  const rendererManager = new StudioTemplateRendererManager(rendererFactory, {
+    outputPathDir,
+  });
+
+  try {
+    rendererManager.renderSchemaToTemplate(schema);
+    return schema;
+  } catch (e) {
+    printer.debug(e);
+    printer.debug('Skipping invalid theme with schema');
+    printer.debug(JSON.stringify(schema, null, 2));
+    throw e;
+  }
+};

package/src/commands/utils/notifyMissingPackages.ts

@@ -1,21 +1,25 @@
-import {
-  pathManager, JSONUtilities, $TSContext, $TSAny,
-} from 'amplify-cli-core';
+import { pathManager, JSONUtilities, $TSContext, $TSAny } from 'amplify-cli-core';
 import { printer } from 'amplify-prompts';
 import fs from 'fs-extra';
 import path from 'path';
 import rangeSubset from 'semver/ranges/subset';
-import { RequiredDependency } from '@aws-amplify/codegen-ui';
-import { ReactRequiredDependencyProvider } from '@aws-amplify/codegen-ui-react';
 import { extractArgs } from './extractArgs';
+import { ReactRequiredDependencyProvider } from '@aws-amplify/codegen-ui-react-old';
+import { ReactRequiredDependencyProvider as ReactRequiredDependencyProviderNew } from '@aws-amplify/codegen-ui-react-new';
+import { StudioComponent } from '@aws-amplify/codegen-ui-new';
 
-const getRequiredDependencies = (): RequiredDependency[] => new ReactRequiredDependencyProvider().getRequiredDependencies();
+const isUpdatedSchema = (schemas: StudioComponent[]) => {
+  return schemas.some(schema => schema.schemaVersion && schema.schemaVersion === '1.0');
+};
+
+const getRequiredDependencies = (schemas: StudioComponent[]) => {
+  if (isUpdatedSchema(schemas)) {
+    return new ReactRequiredDependencyProviderNew().getRequiredDependencies();
+  }
+  return new ReactRequiredDependencyProvider().getRequiredDependencies();
+};
 
-/**
- * Displays a warning to the user if they have npm dependencies
- * they need to install in their application for UIBuilder components to work properly
- */
-export const notifyMissingPackages = (context: $TSContext): void => {
+export const notifyMissingPackages = (context: $TSContext, schemas: StudioComponent[]) => {
   const args = extractArgs(context);
   const localEnvFilePath = args.localEnvFilePath ?? pathManager.getLocalEnvFilePath();
   if (!fs.existsSync(localEnvFilePath)) {
@@ -29,7 +33,7 @@ export const notifyMissingPackages = (context: $TSContext): void => {
     return;
   }
   const packageJson = JSONUtilities.readJson(packageJsonPath) as { dependencies: { [key: string]: string } };
-  getRequiredDependencies().forEach((dependency: $TSAny) => {
+  getRequiredDependencies(schemas).forEach((dependency: $TSAny) => {
     const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
     if (!packageIsInstalled) {
       printer.warn(

package/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./lib",
-    "rootDir": "./src",
-    "strict": true,
-    "skipLibCheck": true
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+	  "outDir": "./lib",
+	  "rootDir": "./src",
+	  "strict": true,
+	  "skipLibCheck": true
+	}
   }
-}