feat: small tweaks (#729)

* feat: small tweaks

filter out Upload from the generated scalars as that's apollo built-in one
do not use the 'latest' version of chimp when initializing or creating a chimp tooling

* test: e2e script updated

.gitignore

@@ -7,3 +7,4 @@
 /tmp
 node_modules
 .idea
+.eslintcache

src/commands/create.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 // @ts-ignore
 import shelljs from 'shelljs';
 import { Command, flags } from '@oclif/command';
+import { getChimpVersion } from '../helpers/get-chimp-version';
 
 function updatePrefixes(appDirectory: string, appPrefix: string, generatedPrefix: string) {
   if (appPrefix || generatedPrefix) {
@@ -29,6 +30,8 @@ function updatePrefixes(appDirectory: string, appPrefix: string, generatedPrefix
       `chimp generate${gqlGenerateCustomPrefixString}`,
       `${appDirectory}/package.json`,
     );
+    const currentChimpVersion = getChimpVersion();
+    shelljs.sed('-i', '"chimp": "latest"', `"chimp": "${currentChimpVersion}"`, `${appDirectory}/package.json`);
   }
 }
 

src/commands/init.ts

@@ -8,6 +8,7 @@ import { findProjectMainPath } from '../generate/helpers/findProjectMainPath';
 import { ListrRenderer, newTask } from '../generate/helpers/ListrHelper';
 import { assertModulePathInTopLevelSrc } from '../init/assert-module-path-in-top-level-src';
 import { assertGitCleanState } from '../init/assert-git-clean-state';
+import { getChimpVersion } from '../helpers/get-chimp-version';
 const DEFAULT_MODULES_PATH = './src/modules';
 
 const debug = configDebug('commands:init');
@@ -26,7 +27,7 @@ const addProjectDependencies = async (projectMainPath: string, modulesPath: stri
     chimpCommand = `${chimpCommand} -p ${modulesPath}`;
     // }
     packageJsonFile.scripts.chimp = chimpCommand;
-    packageJsonFile.devDependencies.chimp = 'latest';
+    packageJsonFile.devDependencies.chimp = getChimpVersion();
   }
 
   function addDevDependenciesWithMatchingVersions(packages: string[]) {

src/generate/parse-graphql/getScalars.spec.ts

@@ -26,3 +26,30 @@ test('get the non extended types with apollo key annotation', () => {
 
   expect(res).toEqual(['MyOwn']);
 });
+
+test('ignore built-in Upload scalar', () => {
+  const schemaString = gql`
+    type TodoItem @key(fields: "id") {
+      id: ID!
+      list: List
+    }
+
+    extend type List {
+      id: ID!
+      todos: [TodoItem!]!
+      incompleteCount: Int!
+    }
+
+    type InMemory {
+      id: ID!
+    }
+
+    scalar First
+    scalar Upload
+    scalar ThirdOne
+  `;
+
+  const res = getScalars(schemaString);
+
+  expect(res).toEqual(['First', 'ThirdOne']);
+});

src/generate/parse-graphql/getScalars.ts

@@ -1,10 +1,15 @@
 import gql from 'graphql-tag';
 
-export default (graphqlString: string) => {
+export default (graphqlString: string): string[] => {
   const graphqlAST = gql`
     ${graphqlString}
   `;
 
-  // @ts-ignore
-  return graphqlAST.definitions.filter((d) => d.kind === 'ScalarTypeDefinition').map((f) => f.name.value);
+  return (
+    graphqlAST.definitions
+      .filter((d) => d.kind === 'ScalarTypeDefinition')
+      // @ts-ignore
+      .map((f) => f.name.value)
+      .filter((s) => s !== 'Upload')
+  );
 };

src/helpers/get-chimp-version.ts

@@ -0,0 +1,9 @@
+// @ts-ignore
+import finder from 'find-package-json';
+
+export const getChimpVersion = () => {
+  const f = finder(__dirname);
+  const packageJson = f.next();
+
+  return packageJson.value.version;
+};

src/scripts/end-to-end-test.ts

@@ -27,7 +27,7 @@ quietExec('./chimp/bin/run create chimp-test-repo', { cwd: pathToRunFrom });
 shelljs.cp('-R', './test-module', '../chimp-test-repo/src/modules/');
 const pathToRunFromChimp = path.join(process.cwd(), '../chimp-test-repo');
 console.log('GOZDECKI pathToRunFromChimp', pathToRunFromChimp);
-shelljs.sed('-i', /"chimp": "latest"/, '"chimp": "../chimp"', path.join(pathToRunFromChimp, 'package.json'));
+shelljs.sed('-i', /"chimp": "0.0.0-development"/, '"chimp": "../chimp"', path.join(pathToRunFromChimp, 'package.json'));
 
 quietExec('npm install', { cwd: pathToRunFromChimp });
 quietExec('npm run type-check', { cwd: pathToRunFromChimp });