@nuffieldtechnologies/rugged-schema-types 0.8.2 → 1.0.1

package/.jshintrc

@@ -1,6 +1,6 @@
-{
-    "esversion": 6,
-    "undef": true,
-    "unused": true,
-    "devel": true
+{
+    "esversion": 6,
+    "undef": true,
+    "unused": true,
+    "devel": true
 }

package/{distribution/index.js → index.ts}

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.All = exports.AllOrganisationFields = exports.Organisations = exports.OrganisationInput = exports.Organisation = exports.AllFormFields = exports.Forms = exports.FormFilter = exports.FormInput = exports.Form = exports.AllRolesFields = exports.AllUserFields = exports.Users = exports.UserInput = exports.User = exports.AllTaskFields = exports.Tasks = exports.TaskFilter = exports.TaskInput = exports.Task = void 0;
 const _TimeStamps = `
     type TimeStamps {
         started: String,
@@ -22,6 +16,7 @@ const _TimeStampsInput = `
         upgraded: String
     }
 `;
+
 const _Event = `
     type Event {
         appVersion: String, 
@@ -33,7 +28,8 @@ const _Event = `
         user: String,
         userEmail: String
     }
-`;
+`
+
 const _EventInput = `
     input EventInput {
         appVersion: String, 
@@ -46,6 +42,7 @@ const _EventInput = `
         userEmail: String
     }
 `;
+
 const _Events = `
 type Events {
     started: Event,
@@ -54,6 +51,7 @@ type Events {
     discarded: Event,
 }
 `;
+
 const _EventsInput = `
 input EventsInput {
     started: EventInput,
@@ -62,6 +60,7 @@ input EventsInput {
     discarded: EventInput,
 }
 `;
+
 const _TemplateInfo = `
     type TemplateInfo {
         name: String,
@@ -70,6 +69,7 @@ const _TemplateInfo = `
         version: String
     }
 `;
+
 const _TemplateInfoInput = `
     input TemplateInfoInput {
         name: String,
@@ -78,18 +78,21 @@ const _TemplateInfoInput = `
         version: String
     }
 `;
+
 const _TaskIdentifiers = `
     type TaskIdentifiers {
         primary: String
         secondary: String
     }
 `;
+
 const _TaskIdentifiersInput = `
     input TaskIdentifiersInput {
         primary: String
         secondary: String
     }
 `;
+
 const _Task = `
     type Task {
         id: ID,
@@ -107,10 +110,14 @@ const _Task = `
         fails: [String]
         reportUrl: String
         data: String
+        refNo: String
     }
 `;
+
 const _AllEventFields = `{appVersion, at, atForHumans, device, deviceModel, osVersion, user, userEmail}`;
+
 const _AllTaskFields = `{id, name, definition, user, userEmail, form, id, organisation, timestamps {started, updated, submitted, processed, upgraded} events {started ${_AllEventFields}, updated ${_AllEventFields}, submitted ${_AllEventFields}, discarded ${_AllEventFields}} , template { type, id, version}, identifiers { primary, secondary}, status, fails, reportUrl, data}`;
+
 const _TaskInput = `
     input TaskInput {
         # The name of the task. TODO does this actually exist?
@@ -139,8 +146,12 @@ const _TaskInput = `
         template: TemplateInfoInput
         identifiers: TaskIdentifiersInput
         data: String
+
+        #A unique identifier for the task that is intended to be human-readable.
+        refNo: String
     }
 `;
+
 const _TaskFilter = `
     input TaskFilter {
         users: [ID]
@@ -150,6 +161,7 @@ const _TaskFilter = `
         before: String
     },
 `;
+
 const _Roles = `
     type Roles {
         user: Boolean
@@ -160,6 +172,7 @@ const _Roles = `
         legacyPush: Boolean
     }
 `;
+
 const _RolesInput = `
     input RolesInput {
         user: Boolean
@@ -167,6 +180,7 @@ const _RolesInput = `
         api: Boolean
     }
 `;
+
 const _User = `
     type User {
         id: ID
@@ -178,6 +192,7 @@ const _User = `
         permissions: String
     }
 `;
+
 const _UserInput = `
     input UserInput {
         id: ID
@@ -188,8 +203,10 @@ const _UserInput = `
         roles: RolesInput
     }
 `;
+
 const _AllRolesFields = `{user, admin, api, uber, super, legacyPush}`;
 const _AllUserFields = `{id, organisation, name, email, roles ${_AllRolesFields}, permissions}`;
+
 const _FormInput = `
 
     input ParamInput {
@@ -210,11 +227,13 @@ const _FormInput = `
         body: String
     }
 `;
+
 const _FormFilter = `
     input FormFilter {
         status: String
     }
 `;
+
 const _Form = `
 
     type Param {
@@ -235,7 +254,9 @@ const _Form = `
         body: String
     }
 `;
+
 const _AllFormFields = `{id, name, key, definition, status,  updated, params {name, value}, resources, body}`;
+
 const _OrganisationInput = `
     input OrganisationInput {
         id: ID
@@ -243,6 +264,7 @@ const _OrganisationInput = `
         logoUrl: String
     }
 `;
+
 const _Organisation = `
     type Organisation {
         id: ID
@@ -250,46 +272,31 @@ const _Organisation = `
         logoUrl: String
     }
 `;
+
 const _AllOrganisationFields = `{id, name, logoUrl}`;
-const Task = _TimeStamps + _Event + _Events + _TemplateInfo + _Task + _TaskIdentifiers;
-exports.Task = Task;
-const TaskInput = _TimeStampsInput + _EventInput + _EventsInput + _TemplateInfoInput + _TaskInput + _TaskIdentifiersInput;
-exports.TaskInput = TaskInput;
-const TaskFilter = _TaskFilter;
-exports.TaskFilter = TaskFilter;
-const Tasks = Task + TaskInput + TaskFilter;
-exports.Tasks = Tasks;
-const AllTaskFields = _AllTaskFields;
-exports.AllTaskFields = AllTaskFields;
-const User = _Roles + _User;
-exports.User = User;
-const UserInput = _RolesInput + _UserInput;
-exports.UserInput = UserInput;
-const Users = User + UserInput;
-exports.Users = Users;
-const AllUserFields = _AllUserFields;
-exports.AllUserFields = AllUserFields;
-const AllRolesFields = _AllRolesFields;
-exports.AllRolesFields = AllRolesFields;
-const Form = _Form;
-exports.Form = Form;
-const FormInput = _FormInput;
-exports.FormInput = FormInput;
-const FormFilter = _FormFilter;
-exports.FormFilter = FormFilter;
-const Forms = Form + FormInput + FormFilter;
-exports.Forms = Forms;
-const AllFormFields = _AllFormFields;
-exports.AllFormFields = AllFormFields;
-const Organisation = _Organisation;
-exports.Organisation = Organisation;
-const OrganisationInput = _OrganisationInput;
-exports.OrganisationInput = OrganisationInput;
-const Organisations = Organisation + OrganisationInput;
-exports.Organisations = Organisations;
-const AllOrganisationFields = _AllOrganisationFields;
-exports.AllOrganisationFields = AllOrganisationFields;
-const All = Tasks + Users + Forms + Organisations;
-exports.All = All;
-var _default = All;
-exports.default = _default;
+
+export const Task = _TimeStamps  + _Event + _Events + _TemplateInfo + _Task + _TaskIdentifiers;
+export const TaskInput = _TimeStampsInput + _EventInput + _EventsInput + _TemplateInfoInput + _TaskInput + _TaskIdentifiersInput;
+export const TaskFilter = _TaskFilter;
+export const Tasks = Task + TaskInput + TaskFilter;
+export const AllTaskFields = _AllTaskFields;
+
+export const User = _Roles + _User;
+export const UserInput = _RolesInput + _UserInput;
+export const Users = User + UserInput;
+export const AllUserFields = _AllUserFields;
+export const AllRolesFields = _AllRolesFields;
+
+export const Form = _Form;
+export const FormInput = _FormInput;
+export const FormFilter = _FormFilter;
+export const Forms = Form + FormInput + FormFilter;
+export const AllFormFields = _AllFormFields;
+
+export const Organisation = _Organisation;
+export const OrganisationInput = _OrganisationInput;
+export const Organisations = Organisation + OrganisationInput;
+export const AllOrganisationFields = _AllOrganisationFields;
+
+export const All = Tasks + Users + Forms + Organisations;
+export default All;

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@nuffieldtechnologies/rugged-schema-types",
-  "version": "0.8.2",
+  "version": "1.0.1",
   "description": "Graphql schema for rugged data",
-  "main": "./distribution/index.js",
+  "main": "dist/index.js",
   "keywords": [
     "graphql",
     "schema"
   ],
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.44",
-    "@babel/core": "7.0.0-beta.44",
-    "@babel/preset-env": "7.0.0-beta.44",
-    "@babel/register": "^7.0.0-beta.44",
-    "chai": "^4.1.2",
-    "mocha": "^4.1.0",
-    "rimraf": "^2.6.2"
+    "@types/chai": "^4.1.3",
+    "@types/mocha": "^5.2.0",
+    "chai": "^4.2.0",
+    "mocha": "^6.1.3",
+    "ts-node": "^6.0.3",
+    "tslint": "^5.10.0",
+    "typescript": "^3.4.3"
   },
   "author": "Tom Edge",
   "license": "UNLICENSED",
   "scripts": {
-    "test": "./node_modules/.bin/mocha --require @babel/register --recursive",
-    "build": "./node_modules/.bin/babel src --out-dir distribution --drop-console=false --ignore node_modules",
-    "prepublishOnly": "npm install && npm run build"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "push": "yarn run build && npm publish"
   }
 }

package/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "lib": ["es6","esnext.asynciterable"],
+    "module": "commonjs",
+    "noImplicitReturns": true,
+    "outDir": "dist",
+    "sourceMap": true,
+    "target": "es6"
+  },
+  "compileOnSave": true
+}

package/.babelrc

@@ -1,9 +0,0 @@
-{
-  "presets": [
-    ["@babel/preset-env", {
-      "targets": {
-        "node": "6.11.5"
-      }
-    }]
-  ]
-}