@khanacademy/graphql-flow 1.2.0 → 3.0.0

package/dist/parser/parse.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.processFiles = exports.processFile = void 0;
 
+var _wonderStuffCore = require("@khanacademy/wonder-stuff-core");
+
 var _parser = require("@babel/parser");
 
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
@@ -62,7 +64,7 @@ const processFile = (filePath, contents) => {
   };
   const resolved = typeof contents === 'string' ? filePath : contents.resolvedPath;
   const text = typeof contents === 'string' ? contents : contents.text;
-  const plugins = resolved.match(/\.tsx?$/) ? ['typescript', filePath.endsWith('x') ? 'jsx' : null].filter(Boolean) : [['flow', {
+  const plugins = resolved.match(/\.tsx?$/) ? ['typescript', filePath.endsWith('x') ? 'jsx' : null].filter(_wonderStuffCore.isTruthy) : [['flow', {
     enums: true
   }], 'jsx'];
   /* eslint-disable flowtype-errors/uncovered */
@@ -245,9 +247,7 @@ const processFile = (filePath, contents) => {
 
 exports.processFile = processFile;
 
-const processTemplate = (tpl, result, getTemplate // getBinding?: (name: string) => Binding,
-// seenTemplates,
-) => {
+const processTemplate = (tpl, result, getTemplate) => {
   var _tpl$loc$start$line, _tpl$loc, _tpl$start, _tpl$end;
 
   // 'cooked' is the string as runtime javascript will see it.
@@ -293,7 +293,7 @@ const processTemplate = (tpl, result, getTemplate // getBinding?: (name: string)
 
   return {
     literals,
-    expressions: expressions.filter(Boolean),
+    expressions: expressions.filter(_wonderStuffCore.isTruthy),
     loc: {
       line: (_tpl$loc$start$line = (_tpl$loc = tpl.loc) === null || _tpl$loc === void 0 ? void 0 : _tpl$loc.start.line) !== null && _tpl$loc$start$line !== void 0 ? _tpl$loc$start$line : -1,
       start: (_tpl$start = tpl.start) !== null && _tpl$start !== void 0 ? _tpl$start : -1,
@@ -361,5 +361,4 @@ const processFiles = (filePaths, getFileSource) => {
   return files;
 };
 
-exports.processFiles = processFiles;
-//# sourceMappingURL=parse.js.map
+exports.processFiles = processFiles;

package/dist/parser/resolve.js

@@ -111,5 +111,4 @@ const resolveGqlTemplate = (template, files, errors, resolved, seen) => {
     raw: template
   };
   return resolved[key].document;
-};
-//# sourceMappingURL=resolve.js.map
+};

package/dist/parser/utils.js

@@ -33,5 +33,4 @@ const getPathWithExtension = pathWithoutExtension => {
   throw new Error("Can't find file at " + pathWithoutExtension);
 };
 
-exports.getPathWithExtension = getPathWithExtension;
-//# sourceMappingURL=utils.js.map
+exports.getPathWithExtension = getPathWithExtension;

package/dist/schemaFromIntrospectionData.js

@@ -66,5 +66,4 @@ const schemaFromIntrospectionData = schema => {
   return result;
 };
 
-exports.schemaFromIntrospectionData = schemaFromIntrospectionData;
-//# sourceMappingURL=schemaFromIntrospectionData.js.map
+exports.schemaFromIntrospectionData = schemaFromIntrospectionData;

package/dist/types.js

@@ -1,2 +1 @@
-"use strict";
-//# sourceMappingURL=types.js.map
+"use strict";

package/dist/utils.js

@@ -4,7 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addCommentAsLineComments = addCommentAsLineComments;
-exports.transferLeadingComments = exports.maybeAddDescriptionComment = exports.liftLeadingPropertyComments = void 0;
+exports.isnNullableType = isnNullableType;
+exports.maybeAddDescriptionComment = exports.liftLeadingPropertyComments = void 0;
+exports.nullableType = nullableType;
+exports.objectTypeFromProperties = objectTypeFromProperties;
+exports.transferLeadingComments = void 0;
 
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
 
@@ -13,7 +17,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const liftLeadingPropertyComments = property => {
-  return transferLeadingComments(property.value, property);
+  return transferLeadingComments(property.typeAnnotation, property);
 };
 
 exports.liftLeadingPropertyComments = liftLeadingPropertyComments;
@@ -51,4 +55,40 @@ const transferLeadingComments = (source, dest) => {
 };
 
 exports.transferLeadingComments = transferLeadingComments;
-//# sourceMappingURL=utils.js.map
+
+function nullableType(type) {
+  return babelTypes.tsUnionType([type, babelTypes.tsNullKeyword(), babelTypes.tsUndefinedKeyword()]);
+}
+
+function isnNullableType(type) {
+  let hasNull = false;
+  let hasUndefined = false;
+
+  if (type.type === 'TSUnionType') {
+    for (const t of type.types) {
+      if (t.type === 'TSNullKeyword') {
+        hasNull = true;
+      } else if (t.type === 'TSUndefinedKeyword') {
+        hasUndefined = true;
+      }
+    }
+  }
+
+  return hasNull && hasUndefined;
+}
+
+function objectTypeFromProperties(properties) {
+  let exitingProperties = {};
+  let filteredProperties = properties.filter(p => {
+    if (p.key.type === 'Identifier') {
+      if (exitingProperties[p.key.name]) {
+        return false;
+      }
+
+      exitingProperties[p.key.name] = true;
+    }
+
+    return true;
+  });
+  return babelTypes.tsTypeLiteral(filteredProperties);
+}

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "@khanacademy/graphql-flow",
-    "version": "1.2.0",
+    "version": "3.0.0",
     "bin": {
         "graphql-flow": "./dist/cli/run.js"
     },
     "scripts": {
         "test": "jest",
-        "publish:ci": "yarn run build && yarn run copy-flow && changeset publish",
-        "build": "babel src -D --out-dir dist --source-maps --ignore 'src/**/*.spec.js','src/**/*.test.js'",
-        "copy-flow": "node ./build-copy-source.js"
+        "publish:ci": "yarn run build && changeset publish",
+        "build": "babel src --extensions '.ts, .tsx' --out-dir dist --ignore 'src/**/*.spec.ts','src/**/*.test.ts' && chmod 755 dist/cli/run.js"
     },
     "main": "dist/index.js",
     "devDependencies": {
@@ -16,9 +15,10 @@
         "@babel/eslint-parser": "^7.17.0",
         "@babel/polyfill": "^7.0.0",
         "@babel/preset-env": "^7.16.11",
-        "@babel/preset-flow": "^7.16.7",
+        "@babel/preset-typescript": "^7.22.5",
         "@changesets/cli": "^2.21.1",
         "@khanacademy/eslint-config": "^0.1.0",
+        "@types/jest": "^29.5.3",
         "babel-jest": "23.4.2",
         "eslint": "8.7.0",
         "eslint-config-prettier": "7.0.0",
@@ -30,16 +30,17 @@
         "eslint-plugin-react-hooks": "^4.3.0",
         "flow-bin": "^0.172.0",
         "graphql-tag": "2.10.1",
-        "jest": "^27.5.1"
+        "jest": "^27.5.1",
+        "typescript": "^5.1.6"
     },
     "dependencies": {
         "@babel/core": "^7.6.2",
         "@babel/generator": "^7.17.3",
         "@babel/traverse": "^7.17.3",
         "@babel/types": "^7.17.0",
-        "@khanacademy/flow-to-ts": "^0.5.2",
+        "@khanacademy/wonder-stuff-core": "^1.5.1",
         "apollo-utilities": "^1.3.4",
-        "graphql": "14.5.8",
+        "graphql": "^16.3.0",
         "jsonschema": "^1.4.1",
         "prettier": "^2.5.1",
         "prettier-eslint": "^13.0.0"

package/{dist/__test__/generateTypeFileContents.test.js → src/__test__/generateTypeFileContents.test.ts}

@@ -1,4 +1,3 @@
-// @flow
 // Test the generate the type file contents
 
 import {getSchemas} from '../cli/config';
@@ -24,35 +23,33 @@ describe('generateTypeFileContents', () => {
             indexPrelude('yarn queries'),
         );
         expect(indexContents).toMatchInlineSnapshot(`
-            "// @flow
-            //
-            // AUTOGENERATED
+            "// AUTOGENERATED
             // NOTE: New response types are added to this file automatically.
             //       Outdated response types can be removed manually as they are deprecated.
             //      To regenerate, run yarn queries
             //
 
-            export type {HelloType} from './Hello.js';
+            export type {HelloType} from './Hello.ts';
             "
         `);
         expect(
             Object.keys(files)
-                .map((k) => `// ${k}\n${files[k]}`)
+                .map((k: any) => `// ${k}\n${files[k]}`)
                 .join('\n\n'),
         ).toMatchInlineSnapshot(`
-            "// __generated__/Hello.js
-            // @flow
+            "// __generated__/Hello.ts
             // AUTOGENERATED -- DO NOT EDIT
             // Generated for operation 'Hello' in file '../hello.js'
-            export type HelloType = {|
-                variables: {||},
-                response: {|
+            export type HelloType = {
+                variables: {},
+                response: {
+              human:
               /** A human character*/
-              human: ?{|
-                id: string
-              |}
-            |}
-            |};
+              {
+                id: string;
+              } | null | undefined;
+            }
+            };
             export type Hello = HelloType['response'];
             export type HelloVariables = HelloType['variables'];
             "
@@ -80,22 +77,22 @@ describe('generateTypeFileContents', () => {
         );
         expect(
             Object.keys(files)
-                .map((k) => `// ${k}\n${files[k]}`)
+                .map((k: any) => `// ${k}\n${files[k]}`)
                 .join('\n\n'),
         ).toMatchInlineSnapshot(`
             "// __generated__/prefix-Hello-suffix.js
-            // @flow
             // AUTOGENERATED -- DO NOT EDIT
             // Generated for operation 'Hello' in file '../hello.js'
-            export type HelloType = {|
-                variables: {||},
-                response: {|
+            export type HelloType = {
+                variables: {},
+                response: {
+              human:
               /** A human character*/
-              human: ?{|
-                id: string
-              |}
-            |}
-            |};
+              {
+                id: string;
+              } | null | undefined;
+            }
+            };
             export type Hello = HelloType['response'];
             export type HelloVariables = HelloType['variables'];
             "
@@ -123,31 +120,31 @@ describe('generateTypeFileContents', () => {
             );
             expect(
                 Object.keys(files)
-                    .map((k) => `// ${k}\n${files[k]}`)
+                    .map((k: any) => `// ${k}\n${files[k]}`)
                     .join('\n\n'),
             ).toMatchInlineSnapshot(`
-                "// __generated__/Hello.js
-                // @flow
+                "// __generated__/Hello.ts
                 // AUTOGENERATED -- DO NOT EDIT
                 // Generated for operation 'Hello' in file '../hello.js'
-                export type HelloType = {|
-                    variables: {||},
-                    response: {|
+                export type HelloType = {
+                    variables: {},
+                    response: {
+                  human:
                   /** A human character*/
-                  human: ?{|
-                    appearsIn: ?$ReadOnlyArray<
+                  {
+                    appearsIn: ReadonlyArray<
                     /** - NEW_HOPE
                     - EMPIRE
                     - JEDI*/
-                    ?Episode>
-                  |}
-                |}
-                |};
+                    Episode | null | undefined> | null | undefined;
+                  } | null | undefined;
+                }
+                };
                 /* eslint-disable no-undef */
                 export enum Episode {
-                  NEW_HOPE,
-                  EMPIRE,
-                  JEDI,
+                  NEW_HOPE = \\"NEW_HOPE\\",
+                  EMPIRE = \\"EMPIRE\\",
+                  JEDI = \\"JEDI\\",
                 };
                 /* eslint-enable no-undef */
                 "