@fraym/crud 0.13.1 → 0.14.1

package/dist/cmd/crud.js

@@ -188,6 +188,8 @@ const getValueString = (v) => {
             return `${v.value}`;
         case graphql_1.Kind.NULL:
             return `null`;
+        case graphql_1.Kind.ENUM:
+            return `${v.value}`;
         case graphql_1.Kind.OBJECT:
             let objectString = "";
             v.fields.forEach(f => {
@@ -197,10 +199,32 @@ const getValueString = (v) => {
                 objectString += `${f.name.value}: ${getValueString(f.value)}`;
             });
             return `{${objectString}}`;
-        default:
-            throw new Error(`values of kind ${v.kind} are currently not supported`);
     }
 };
+const addNestedTypesToSchema = (definitions, nestedTypeName, nestedTypes) => {
+    const nestedTypeDefinition = definitions[nestedTypeName];
+    if (nestedTypes.indexOf(nestedTypeName) !== -1 ||
+        (nestedTypeDefinition && nestedTypeDefinition.isCrudType)) {
+        return {
+            schema: "",
+            nestedTypes: [],
+        };
+    }
+    let newSchema = definitions[nestedTypeName].schema;
+    nestedTypes.push(nestedTypeName);
+    nestedTypeDefinition.nestedTypes.forEach(nestedNestedTypeName => {
+        const nestedSchemaData = addNestedTypesToSchema(definitions, nestedNestedTypeName, nestedTypes);
+        if (nestedSchemaData.schema === "") {
+            return;
+        }
+        newSchema += `\n${nestedSchemaData.schema}`;
+        nestedTypes.push(...nestedSchemaData.nestedTypes);
+    });
+    return {
+        schema: newSchema,
+        nestedTypes: nestedTypes,
+    };
+};
 const migrateSchemas = async (definitions, serverAddress, namespace) => {
     console.log(`Considering ${Object.keys(definitions).length} type definitions for migration.`);
     console.log(`Using server address ${serverAddress}`);
@@ -222,12 +246,12 @@ const migrateSchemas = async (definitions, serverAddress, namespace) => {
             typesToUpdate.push(existingName);
             updateSchema += `\n${definitions[existingName].schema}`;
             definitions[existingName].nestedTypes.forEach(nestedTypeName => {
-                if (nestedTypesToUpdate.indexOf(nestedTypeName) !== -1 ||
-                    (definitions[nestedTypeName] && definitions[nestedTypeName].isCrudType)) {
+                const nestedSchemaData = addNestedTypesToSchema(definitions, nestedTypeName, nestedTypesToUpdate);
+                if (nestedSchemaData.schema === "") {
                     return;
                 }
-                updateSchema += `\n${definitions[nestedTypeName].schema}`;
-                nestedTypesToUpdate.push(nestedTypeName);
+                updateSchema += `\n${nestedSchemaData.schema}`;
+                nestedTypesToUpdate.push(...nestedSchemaData.nestedTypes);
             });
         }
     });
@@ -238,27 +262,27 @@ const migrateSchemas = async (definitions, serverAddress, namespace) => {
         typesToCreate.push(newName);
         createSchema += `\n${definitions[newName].schema}`;
         definitions[newName].nestedTypes.forEach(nestedTypeName => {
-            if (nestedTypesToCreate.indexOf(nestedTypeName) !== -1 ||
-                (definitions[nestedTypeName] && definitions[nestedTypeName].isCrudType)) {
+            const nestedSchemaData = addNestedTypesToSchema(definitions, nestedTypeName, nestedTypesToCreate);
+            if (nestedSchemaData.schema === "") {
                 return;
             }
-            createSchema += `\n${definitions[nestedTypeName].schema}`;
-            nestedTypesToCreate.push(nestedTypeName);
+            createSchema += `\n${nestedSchemaData.schema}`;
+            nestedTypesToCreate.push(...nestedSchemaData.nestedTypes);
         });
     });
     if (typesToCreate.length > 0) {
         console.log(`Creating ${typesToCreate.length} types: ${typesToCreate}...`);
-        await managementClient.createTypes(createSchema).catch(console.log);
+        await managementClient.createTypes(createSchema);
         console.log(`Created ${typesToCreate.length} types`);
     }
     if (typesToUpdate.length > 0) {
         console.log(`Updating ${typesToUpdate.length} types: ${typesToUpdate}...`);
-        await managementClient.updateTypes(updateSchema).catch(console.log);
+        await managementClient.updateTypes(updateSchema);
         console.log(`Updated ${typesToUpdate.length} types`);
     }
     if (typesToRemove.length > 0) {
         console.log(`Removing ${typesToRemove.length} types: ${typesToRemove}...`);
-        await managementClient.removeTypes(typesToRemove).catch(console.log);
+        await managementClient.removeTypes(typesToRemove);
         console.log(`Removed ${typesToRemove.length} types`);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/crud",
-    "version": "0.13.1",
+    "version": "0.14.1",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/crud-nodejs",
     "repository": {