@aws-amplify/data-schema 0.14.3 → 0.14.5

package/lib-esm/src/CombineSchema.js

@@ -23,6 +23,7 @@ function internalCombine(schemas) {
         },
         models: schemas.reduce((prev, schema) => ({ ...prev, ...schema.models }), {}),
         transform() {
+            validateDuplicateTypeNames(schemas);
             const baseDefinition = {
                 functionSlots: [],
                 jsFunctions: [],
@@ -53,3 +54,19 @@ function internalCombine(schemas) {
         ...exports.combinedSchemaBrand,
     };
 }
+function validateDuplicateTypeNames(schemas) {
+    const allSchemaKeys = schemas.flatMap((s) => Object.keys(s.data.types));
+    const keySet = new Set();
+    const duplicateKeySet = new Set();
+    allSchemaKeys.forEach((key) => {
+        if (keySet.has(key)) {
+            duplicateKeySet.add(key);
+        }
+        else {
+            keySet.add(key);
+        }
+    });
+    if (duplicateKeySet.size > 0) {
+        throw new Error(`The schemas you are attempting to combine have a name collision. Please remove or rename ${Array.from(duplicateKeySet).join(', ')}.`);
+    }
+}

package/lib-esm/src/ModelSchema.d.ts

@@ -25,16 +25,21 @@ type BackendSecret = {
     resolvePath: (backendIdentifier: any) => any;
 };
 export type DatasourceEngine = 'mysql' | 'postgresql' | 'dynamodb';
+type SubnetAZ = {
+    subnetId: string;
+    availabilityZone: string;
+};
+type VpcConfig = {
+    vpcId: string;
+    securityGroupIds: string[];
+    subnetAvailabilityZones: SubnetAZ[];
+};
 type DatasourceConfig<DE extends DatasourceEngine> = DE extends 'dynamodb' ? {
     engine: DE;
 } : {
     engine: DE;
-    hostname: BackendSecret;
-    username: BackendSecret;
-    password: BackendSecret;
-    port: BackendSecret;
-    databaseName: BackendSecret;
-    vpcConfig?: Record<string, never>;
+    connectionUri: BackendSecret;
+    vpcConfig?: VpcConfig;
 };
 export type SchemaConfig<DE extends DatasourceEngine, DC extends DatasourceConfig<DE>> = {
     database: DC;