@fraym/crud 0.4.0 → 0.6.0

package/README.md

@@ -22,9 +22,11 @@ Use the `crud` cli command to automatically apply your crud schemas to the crud
 Your type schemas have to match the glob you specify in the `CRUD_SCHEMA_GLOB` env variable (default: `./src/**/*.graphql`).
 You can specify the address (and port) of the crud service instance you use in the `CRUD_SERVER_ADDRESS` env variable (default: `127.0.0.1:9000`).
 
+You need to add a file that contains all built-in directives to your type schemas. The latest version of this file can be found [here](default.graphql).
+
 ### Config
 
-use a `.env` file or env variables to configure cte clients and the command:
+Use a `.env` file or env variables to configure cte clients and the command:
 
 ```env
 CRUD_SERVER_ADDRESS=127.0.0.1:9000
@@ -110,7 +112,7 @@ await client.delete("tenantId", "YourCrudType", "id");
 ### Get a single data element
 
 The name of `YourCrudType` has to equal your type name in your schema (also in casing).
-The `id` has to match the id of the data that you want to delete.
+The `id` has to match the id of the data that you want to get.
 
 ```typescript
 const data = await client.getData("tenantId", "YourCrudType", "id");

package/dist/cmd/crud.js

@@ -34,18 +34,38 @@ run();
 const getTypeDefinition = (schema) => {
     const definitions = {};
     schema.toConfig().types.forEach(t => {
-        var _a;
-        if (((_a = t.astNode) === null || _a === void 0 ? void 0 : _a.kind) !== graphql_1.Kind.OBJECT_TYPE_DEFINITION || !(t instanceof graphql_1.GraphQLObjectType)) {
+        if (!(t instanceof graphql_1.GraphQLObjectType) && !(t instanceof graphql_1.GraphQLEnumType)) {
             return;
         }
         const name = t.toString();
         if (definitions[name]) {
             throw new Error(`duplicate definition for type "${name}" detected, try renaming one of them as they have to be uniquely named`);
         }
-        definitions[name] = getTypeDefinitionFromGraphQLObjectType(t);
+        if (t instanceof graphql_1.GraphQLObjectType) {
+            definitions[name] = getTypeDefinitionFromGraphQLObjectType(t);
+            return;
+        }
+        if (t instanceof graphql_1.GraphQLEnumType) {
+            definitions[name] = getTypeDefinitionFromGraphQLEnumType(t);
+            return;
+        }
     });
     return definitions;
 };
+const getTypeDefinitionFromGraphQLEnumType = (t) => {
+    var _a, _b;
+    const name = t.toString();
+    let enumValuesString = "";
+    (_b = (_a = t.astNode) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b.forEach(value => {
+        enumValuesString += `\n\t${value.name.value}`;
+    });
+    const schema = `enum ${name} {${enumValuesString}\n}`;
+    return {
+        isCrudType: false,
+        nestedTypes: [],
+        schema,
+    };
+};
 const getTypeDefinitionFromGraphQLObjectType = (t) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const isCrudType = (_c = (((_a = t.astNode) === null || _a === void 0 ? void 0 : _a.directives) &&
@@ -86,7 +106,7 @@ const getFieldStringAndNestedTypes = (f) => {
         nestedTypes.push(nestedType);
     }
     return {
-        str: `\n${f.name.value}: ${typeString}${directivesString}`,
+        str: `\n\t${f.name.value}: ${typeString}${directivesString}`,
         nestedTypes,
     };
 };
@@ -98,7 +118,8 @@ const getTypeData = (t) => {
                 name === "Float" ||
                 name === "ID" ||
                 name === "Boolean" ||
-                name === "Int"
+                name === "Int" ||
+                name === "DateTime"
                 ? {
                     str: name,
                 }
@@ -183,23 +204,24 @@ const migrateSchemas = async (definitions, serverAddress) => {
             typesToUpdate.push(existingName);
             updateSchema += `\n${definitions[existingName].schema}`;
             definitions[existingName].nestedTypes.forEach(nestedTypeName => {
-                if (nestedTypesToUpdate.indexOf(nestedTypeName) !== -1) {
+                if (nestedTypesToUpdate.indexOf(nestedTypeName) !== -1 ||
+                    (definitions[nestedTypeName] && definitions[nestedTypeName].isCrudType)) {
                     return;
                 }
                 updateSchema += `\n${definitions[nestedTypeName].schema}`;
                 nestedTypesToUpdate.push(nestedTypeName);
             });
-            delete definitions[existingName];
         }
     });
     Object.keys(definitions).forEach(newName => {
-        if (!definitions[newName].isCrudType) {
+        if (!definitions[newName].isCrudType || existingTypeNames.includes(newName)) {
             return;
         }
         typesToCreate.push(newName);
         createSchema += `\n${definitions[newName].schema}`;
         definitions[newName].nestedTypes.forEach(nestedTypeName => {
-            if (nestedTypesToCreate.indexOf(nestedTypeName) !== -1) {
+            if (nestedTypesToCreate.indexOf(nestedTypeName) !== -1 ||
+                (definitions[nestedTypeName] && definitions[nestedTypeName].isCrudType)) {
                 return;
             }
             createSchema += `\n${definitions[nestedTypeName].schema}`;

package/dist/config/config.js

@@ -28,7 +28,6 @@ const useConfigDefaults = (config) => {
     if (!config) {
         config = (0, exports.getEnvConfig)();
     }
-    console.log(config);
     return {
         serverAddress: config.serverAddress,
         keepaliveTimeout: (_a = config.keepaliveTimeout) !== null && _a !== void 0 ? _a : 3 * 1000,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/crud",
-    "version": "0.4.0",
+    "version": "0.6.0",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/crud-nodejs",
     "repository": {
@@ -16,8 +16,7 @@
         "clean": "rm -rf dist",
         "prepublishOnly": "npm test && npm run lint && npm run build",
         "preversion": "npm run lint",
-        "cmd": "dist/cmd/crud.js",
-        "cmd2": "dist/cmd/crud.js --config .tst/crud.config.json"
+        "cmd": "dist/cmd/crud.js"
     },
     "files": [
         "dist/**/*"
@@ -33,7 +32,6 @@
         "@graphql-tools/load": "^7.8.6",
         "@grpc/grpc-js": "^1.7.2",
         "dotenv": "^16.0.3",
-        "fs": "^0.0.1-security",
         "graphql": "^16.6.0",
         "yargs": "^17.6.2"
     },