@aws-amplify/amplify-util-uibuilder 1.2.13 → 1.2.15-beta.0

package/src/commands/utils/notifyMissingPackages.ts

@@ -2,10 +2,24 @@ 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 { extractArgs } from './extractArgs';
-const REQUIRED_PACKAGES: { [key: string]: string } = { '@aws-amplify/ui-react': '*', 'aws-amplify': '*' };
+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';
 
-export const notifyMissingPackages = (context: $TSContext) => {
+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();
+};
+
+export const notifyMissingPackages = (context: $TSContext, schemas: StudioComponent[]) => {
   const args = extractArgs(context);
   const localEnvFilePath = args.localEnvFilePath ?? pathManager.getLocalEnvFilePath();
   if (!fs.existsSync(localEnvFilePath)) {
@@ -19,22 +33,20 @@ export const notifyMissingPackages = (context: $TSContext) => {
     return;
   }
   const packageJson = JSONUtilities.readJson(packageJsonPath) as { dependencies: { [key: string]: string } };
-  Object.keys(REQUIRED_PACKAGES).forEach(packageName => {
-    const packageIsInstalled = Object.keys(packageJson.dependencies).includes(packageName);
+  getRequiredDependencies(schemas).forEach((dependency: $TSAny) => {
+    const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
     if (!packageIsInstalled) {
-      printer.warn(`UIBuilder components required "${packageName}" that is not in your package.json. Run \`npm install ${packageName}\``);
-    } else if (!packageVersionMatches(REQUIRED_PACKAGES[packageName], packageJson.dependencies[packageName])) {
       printer.warn(
-        `UIBuilder components requires version "${REQUIRED_PACKAGES[packageName]}" of "${packageName}". You currently are on version "${packageJson.dependencies[packageName]}".`,
+        `UIBuilder components required "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`,
+      );
+    } else if (!rangeSubset(packageJson.dependencies[dependency.dependencyName], dependency.supportedSemVerPattern)) {
+      printer.warn(
+        `UIBuilder components requires version "${dependency.supportedSemVerPattern}" of "${
+          dependency.dependencyName
+        }". You currently are on version "${packageJson.dependencies[dependency.dependencyName]}". Run \`npm install "${
+          dependency.dependencyName
+        }@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`,
       );
     }
   });
 };
-
-const packageVersionMatches = (requiredVersion: string, existingVersion: string) => {
-  if (requiredVersion === '*') {
-    return true;
-  }
-
-  return requiredVersion === existingVersion;
-};