1.1.0

CONTRIBUTING.md

@@ -1,13 +1,10 @@
 ## Prerequisites
-
 - [Node.js](http://nodejs.org/) >= 10 must be installed.
 
 ## Installation
-
 - Running `yarn` in the module's root directory will install everything you need for development.
 
 ## Running Tests
-
 - `yarn test` will run the tests once.
 
 ## Deploy prisma schema
@@ -27,5 +24,4 @@ API schema will be created also
 - `yarn start`
 
 ## Building
-
 - No building required

README.md

@@ -1,55 +1,48 @@
 
-## Upload server for [@prisma-cms](https://github.com/prisma-cms)
+## Module boilerplate server for [@prisma-cms](https://github.com/prisma-cms)
 
 ### Usage
 
 #### Standalone
 
+Download module
+
 ```
-git clone https://github.com/prisma-cms/upload-module
-cd upload-module
-yarn
-endpoint={NEW_PRISMA_ENDPOINT} yarn deploy
-endpoint={CREATED_PRISMA_ENDPOINT} yarn start
+git clone https://github.com/prisma-cms/module-boilerplate
+cd module-boilerplate
 ```
-Open in brouser http://localhost:4000
+Install dependencies
 
-List of uploaded files:
+`yarn install`
+
+Update module schema 
+
+`./module-boilerplate/src/modules/schema/` (see [instruction](https://github.com/prisma-cms/boilerplate#readme))
+
+Deploy schema to prisma-server
+
+`endpoint={NEW_PRISMA_ENDPOINT} yarn deploy`
+
+Start server
+
+`endpoint={CREATED_PRISMA_ENDPOINT} yarn start`
+
+Open in brouser http://localhost:4000
 
-```
-query filesConnection{
-  filesConnection(
-    first: 5
-  ){
-    aggregate{
-      count
-    }
-    edges{
-      node{
-        id
-        path
-        filename
-        mimetype
-        encoding
-        hash
-      }
-    }
-  }
-}
-```
 
 #### Use as module for [@prisma-cms/boilerplate](https://github.com/prisma-cms/boilerplate)
 
 Just add as module in mergeModules here: https://github.com/prisma-cms/boilerplate/blob/master/src/server/modules/index.mjs
 
-#### Use [uploader](https://github.com/prisma-cms/uploader) component
+
+### [Component-boilerplate](https://github.com/prisma-cms/component-boilerplate) usage as front-end for module.
 
 ```
-git clone https://github.com/prisma-cms/uploader
-cd uploader
+git clone https://github.com/prisma-cms/component-boilerplate
+cd component-boilerplate
 yarn
 yarn start
 ```
 Open in brouser http://localhost:3000
 
-Note that upload-module should work on port 4000 or configure [proxySetup](https://github.com/prisma-cms/uploader/blob/master/src/setupProxy.js).
+Note that *module-boilerplate* should work on port 4000 or configure [proxySetup](https://github.com/prisma-cms/component-boilerplate/blob/master/src/setupProxy.js).

changelog.md

@@ -1,3 +1,7 @@
+1.1.0
+===============================
+- Upgrade modules
+
 1.0.0
 ===============================
 - First release

nodemon.json

@@ -0,0 +1,5 @@
+{   
+  "ignore": [
+    "*/generated/*"
+  ] 
+}

package.json

@@ -1,23 +1,26 @@
 {
   "name": "@prisma-cms/module-bilerplate",
   "description": "Module boilerplate for @prisma-cms/server",
-  "version": "1.0.0-beta",
+  "version": "1.1.0-beta",
   "main": "src/",
   "files": [
     "src"
   ],
   "scripts": {
     "start": "action=start-server node --experimental-modules src/server",
     "deploy": "NODE_ENV=test node --experimental-modules src/server/scripts/deploy/with-prisma",
-    "build-api": "node --experimental-modules src/server/scripts/deploy/api-only"
+    "build-api": "node --experimental-modules src/server/scripts/deploy/api-only",
+    "test": "NODE_OPTIONS=\"--experimental-modules\" yarn mocha --delay src/__tests__/"
   },
   "dependencies": {
-    "@prisma-cms/prisma-module": "^1.1.0-beta",
-    "merge-graphql-schemas": "^1.5.7",
-    "chalk": "^2.4.1"
+    "@prisma-cms/prisma-module": "^1.2.0-beta",
+    "chalk": "^2.4.1",
+    "merge-graphql-schemas": "^1.5.7"
   },
   "devDependencies": {
-    "@prisma-cms/server": "^2.1.4-beta"
+    "@prisma-cms/server": "^2.1.6-beta",
+    "expect": "^23.6.0",
+    "mocha": "^5.2.0"
   },
   "resolutions": {
     "graphql": "14.0.2"

src/__tests__/default/module/index.mjs

@@ -0,0 +1,95 @@
+
+import chalk from "chalk";
+
+import CmsModule from "../../../";
+
+import InnerModule from "./innerModule";
+
+
+import path from 'path';
+import MergeSchema from 'merge-graphql-schemas';
+
+const { fileLoader, mergeTypes } = MergeSchema
+const moduleURL = new URL(import.meta.url);
+const __dirname = path.dirname(moduleURL.pathname);
+
+
+class TestModule extends CmsModule {
+
+
+  constructor(options = {}) {
+
+    super(options);
+
+    this.mergeModules([
+      // RouterModuleExtended,
+      InnerModule,
+    ]);
+
+  }
+
+
+  getSchema(types = []) {
+
+    let schema = fileLoader(__dirname + '/schema/database/', {
+      recursive: true,
+    });
+
+
+    if (schema) {
+      types = types.concat(schema);
+    }
+
+
+    let typesArray = super.getSchema(types);
+
+    return typesArray;
+
+  }
+
+
+  getApiSchema(types = []) {
+
+    /**
+     * Hack for imitate = "src/schema/generated/prisma.graphql";
+     */
+    let baseSchema = this.getSchema();
+
+    // console.log("baseSchema", baseSchema);
+
+    let apiSchema = super.getApiSchema(types.concat([baseSchema]), []);
+
+    // console.log(chalk.green("TestModule apiSchema"), apiSchema);
+
+
+    let schema = fileLoader(__dirname + '/schema/api/', {
+      recursive: true,
+    });
+
+    // apiSchema = mergeTypes([apiSchema.concat(schema).concat(baseSchema)], { all: true });
+    apiSchema = mergeTypes([apiSchema.concat(schema)], { all: true });
+
+    return apiSchema;
+
+  }
+
+
+  getExcludableApiTypes() {
+
+    return super.getExcludableApiTypes([
+      // "UserCreateInput",
+      // "User",
+      // "EnumFields",
+    ]);
+
+  }
+
+
+}
+
+
+export {
+  CmsModule as PrismaModule,
+}
+
+export default TestModule;

src/__tests__/default/module/innerModule/index.mjs

@@ -0,0 +1,72 @@
+
+
+import chalk from "chalk";
+
+import {PrismaModule} from "../";
+
+import path from 'path';
+import MergeSchema from 'merge-graphql-schemas';
+const { fileLoader, mergeTypes } = MergeSchema
+const moduleURL = new URL(import.meta.url);
+const __dirname = path.dirname(moduleURL.pathname);
+
+
+
+class InnerModule extends PrismaModule {
+
+
+  getSchema(types = []) {
+
+
+    let schema = fileLoader(__dirname + '/schema/database/', {
+      recursive: true,
+    });
+
+
+    console.log(chalk.green("schema"), schema);
+
+
+    if(schema){
+      types = types.concat(schema);
+    }
+
+
+    let typesArray = super.getSchema(types);
+
+    return typesArray;
+
+  }
+
+
+  // getApiSchema(types = []) {
+
+  //   let schema = fileLoader(__dirname + '/schema/api/', {
+  //     recursive: true,
+  //   });
+
+  //   // apiSchema = mergeTypes([apiSchema.concat(schema)], { all: true });
+
+
+  //   return schema;
+
+  // }
+
+
+
+
+  getExcludableApiTypes() {
+
+    return super.getExcludableApiTypes([
+      // "UserCreateInput",
+      // "User",
+      // "EnumFields",
+    ]);
+
+  }
+
+
+}
+
+
+export default InnerModule;
+

src/__tests__/default/module/schema/api/schema.graphql

@@ -0,0 +1,5 @@
+
+
+enum TestEnumFields{
+  TestField
+}

src/__tests__/default/module/schema/api/user.graphql

@@ -0,0 +1,9 @@
+
+
+type TestUser {
+  prismaTestUsername: String
+}
+
+input TestUserCreateInput {
+  testUsername: String
+}

src/__tests__/default/module/schema/database/query.graphql

@@ -0,0 +1,5 @@
+
+
+type Query {
+  testUsers: [TestUser!]
+}

src/__tests__/default/module/schema/database/user.graphql

@@ -0,0 +1,5 @@
+
+type TestUser {
+  testUsername: String
+  prismaTestUsername: String
+}

src/__tests__/default/resolverstest.mjs

@@ -0,0 +1,17 @@
+
+import expect from "expect";
+
+import module from "./module";
+
+const resolvers = module.getResolvers();
+
+describe("Default module resolvers tests", () => {
+
+  it("resolvers", () => {
+
+    expect(typeof resolvers === "object").toBe(true);
+
+  });
+
+});
+