fix: update unit tests to new cli

examples/react-datastore/src/datastore/generated/schema.json

@@ -43,4 +43,4 @@
       }
     }
   }
-}
+}

packages/datastore/cli/src/generate-documents/createJsonSchema.ts

@@ -1,49 +1,61 @@
 import { ModelDefinition, getPrimaryKey } from "@graphback/core";
 import {
-    isNonNullType,
-    GraphQLOutputType,
-    getNullableType
+  isNonNullType,
+  GraphQLOutputType,
+  getNullableType
 } from "graphql";
 import { convertToTsType } from "../utils";
 
 
 const getFieldParameters = (fieldName: string, type: GraphQLOutputType): any => {
-    const options: any = {};
+  const options: any = {};
 
-    // TODO handle relationships
+  // TODO handle relationships
 
-    options.key = fieldName;
+  options.key = fieldName;
 
-    if (isNonNullType(type)) {
-        type = getNullableType(type);
-        options.isRequired = true;
-    }
+  if (isNonNullType(type)) {
+    type = getNullableType(type);
+    options.isRequired = true;
+  }
 
-    return { type: convertToTsType(type), ...options };
+  return { type: convertToTsType(type), ...options };
 };
 
 const getModelProperties = (model: ModelDefinition, primaryKey: string) => {
-    const fieldMap = model.graphqlType.getFields();
-
-    return Object.keys(fieldMap)
-        .map(fieldName => {
-            const fieldOptions = getFieldParameters(fieldName, fieldMap[fieldName].type);
-            if (fieldName === primaryKey) {
-                fieldOptions.primary = true;
-            }
-            return { [fieldName]: fieldOptions };
-        })
-        .reduce((prev, current) => ({ ...prev, ...current }), {});
+  const fieldMap = model.graphqlType.getFields();
+
+  const generatedProperties = Object.keys(fieldMap)
+    .map(fieldName => {
+      const fieldOptions = getFieldParameters(fieldName, fieldMap[fieldName].type);
+      if (fieldName === primaryKey) {
+        fieldOptions.primary = true;
+      }
+      return { [fieldName]: fieldOptions };
+    })
+    .reduce((prev, current) => ({ ...prev, ...current }), {});
+
+  generatedProperties._version = {
+    type: "string",
+    key: "_version",
+    isRequired: true
+  };
+  generatedProperties._deleted = {
+    type: "string",
+    key: "_version",
+    isRequired: true
+  };
+  return generatedProperties;
 };
 
 export const createJsonSchema = (model: ModelDefinition) => {
-    const primaryKey = getPrimaryKey(model.graphqlType).name;
-
-    return {
-        name: model.graphqlType.name,
-        version: 1,
-        type: "object",
-        primaryKey: primaryKey,
-        properties: getModelProperties(model, primaryKey)
-    };
+  const primaryKey = getPrimaryKey(model.graphqlType).name;
+
+  return {
+    name: model.graphqlType.name,
+    version: 1,
+    type: "object",
+    primaryKey: primaryKey,
+    properties: getModelProperties(model, primaryKey)
+  };
 };

packages/datastore/cli/src/generate-documents/createModelTypes.ts

@@ -26,8 +26,8 @@ export const createModelType = (model: ModelDefinition) => {
 
     return `export interface ${modelName} {
     ${getModelProperties(model)}
-    _version?: number;
-    _deleted?: boolean;
+    _version: number;
+    _deleted: boolean;
 }
 
 export type ${modelName}Create = ${primaryKey ? `Omit<${modelName}, "${primaryKey}">` : modelName};

packages/datastore/cli/tests/Cli.test.ts

@@ -1,21 +1,24 @@
 import * as util from 'util';
-import { mkdirSync, rmdirSync, readFileSync } from "fs";
+import { mkdirSync, rmdirSync, readFileSync, existsSync } from "fs";
 import { join } from 'path';
 
-beforeEach(() => mkdirSync("./output/"));
+beforeEach(() => {
+  if (!existsSync("./output/"))
+    mkdirSync("./output/")
+});
 afterEach(() => rmdirSync("./output/", { recursive: true }));
 
 test("generate", async () => {
-    const exec = util.promisify(require('child_process').exec);
-    const cliExec = join(__dirname, '../dist/index.js');
-    const schemaPath = join(__dirname, './mock.graphql');
+  const exec = util.promisify(require('child_process').exec);
+  const cliExec = join(__dirname, '../bin/offix.js');
+  const schemaPath = join(__dirname, './mock.graphql');
 
-    await exec(`node ${cliExec} generate --schema ${schemaPath} --outputPath output/`);
-    const schema = readFileSync("./output/schema.json").toString();
-    const index = readFileSync("./output/index.ts").toString();
-    const types = readFileSync("./output/types.ts").toString();
+  await exec(`node ${cliExec} generate --schema ${schemaPath} --outputPath output/`);
+  const schema = readFileSync("./output/schema.json").toString();
+  const index = readFileSync("./output/index.ts").toString();
+  const types = readFileSync("./output/types.ts").toString();
 
-    expect(types).toMatchSnapshot();
-    expect(schema).toMatchSnapshot();
-    expect(index).toMatchSnapshot();
+  expect(types).toMatchSnapshot();
+  expect(schema).toMatchSnapshot();
+  expect(index).toMatchSnapshot();
 });

packages/datastore/cli/tests/__snapshots__/Cli.test.ts.snap

@@ -6,8 +6,8 @@ exports[`generate 1`] = `
     title: string;
     description: string;
     comments: string[]
-    _version?: number;
-    _deleted?: boolean;
+    _version: number;
+    _deleted: boolean;
 }
 
 export type NoteCreate = Omit<Note, \\"_id\\">;
@@ -18,8 +18,8 @@ export interface Comment {
     title: string;
     description: string;
     noteComment: string
-    _version?: number;
-    _deleted?: boolean;
+    _version: number;
+    _deleted: boolean;
 }
 
 export type CommentCreate = Omit<Comment, \\"_id\\">;
@@ -55,6 +55,16 @@ exports[`generate 2`] = `
         \\"type\\": \\"string[]\\",
         \\"key\\": \\"comments\\",
         \\"isRequired\\": true
+      },
+      \\"_version\\": {
+        \\"type\\": \\"string\\",
+        \\"key\\": \\"_version\\",
+        \\"isRequired\\": true
+      },
+      \\"_deleted\\": {
+        \\"type\\": \\"string\\",
+        \\"key\\": \\"_version\\",
+        \\"isRequired\\": true
       }
     }
   },
@@ -84,6 +94,16 @@ exports[`generate 2`] = `
         \\"type\\": \\"string\\",
         \\"key\\": \\"noteComment\\",
         \\"isRequired\\": true
+      },
+      \\"_version\\": {
+        \\"type\\": \\"string\\",
+        \\"key\\": \\"_version\\",
+        \\"isRequired\\": true
+      },
+      \\"_deleted\\": {
+        \\"type\\": \\"string\\",
+        \\"key\\": \\"_version\\",
+        \\"isRequired\\": true
       }
     }
   }