@graphprotocol/graph-cli 0.37.3-alpha-20230111132934-b4190fb → 0.37.3-alpha-20230111134832-100975c

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.37.3-alpha-20230111132934-b4190fb
+## 0.37.3-alpha-20230111134832-100975c
 
 ### Patch Changes
 

package/dist/migrations/mapping_api_version_0_0_1.js

@@ -26,16 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const semver_1 = __importDefault(require("semver"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const versions_1 = require("./util/versions");
 const load_manifest_1 = require("./util/load-manifest");
 // If any of the manifest apiVersions are 0.0.1, replace them with 0.0.2
 exports.default = {
     name: 'Bump mapping apiVersion from 0.0.1 to 0.0.2',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ sourceDir, manifestFile, }) => {
         // Obtain the graph-ts version, if possible
         let graphTsVersion;
         try {
@@ -71,8 +69,14 @@ exports.default = {
         // and replace the values in the data structures here; unfortunately
         // writing that back to the file messes with the formatting more than
         // we'd like; that's why for now, we use a simple patching approach
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: 0.0.1', 'g'), 'apiVersion: 0.0.2');
-        await toolbox.patching.replace(manifestFile, new RegExp("apiVersion: '0.0.1'", 'g'), "apiVersion: '0.0.2'");
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: "0.0.1"', 'g'), 'apiVersion: "0.0.2"');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: 0.0.1', 'g'), 'apiVersion: 0.0.2');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp("apiVersion: '0.0.1'", 'g'), "apiVersion: '0.0.2'");
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: "0.0.1"', 'g'), 'apiVersion: "0.0.2"');
     },
 };

package/dist/migrations/mapping_api_version_0_0_2.js

@@ -27,13 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const semver_1 = __importDefault(require("semver"));
-const toolbox = __importStar(require("gluegun/toolbox"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 const versions_1 = require("./util/versions");
 // If any of the manifest apiVersions are 0.0.2, replace them with 0.0.3
 exports.default = {
     name: 'Bump mapping apiVersion from 0.0.2 to 0.0.3',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ sourceDir, manifestFile, }) => {
         // Obtain the graph-ts version, if possible
         let graphTsVersion;
         try {
@@ -69,8 +69,14 @@ exports.default = {
         // and replace the values in the data structures here; unfortunately
         // writing that back to the file messes with the formatting more than
         // we'd like; that's why for now, we use a simple patching approach
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: 0.0.2', 'g'), 'apiVersion: 0.0.3');
-        await toolbox.patching.replace(manifestFile, new RegExp("apiVersion: '0.0.2'", 'g'), "apiVersion: '0.0.3'");
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: "0.0.2"', 'g'), 'apiVersion: "0.0.3"');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: 0.0.2', 'g'), 'apiVersion: 0.0.3');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp("apiVersion: '0.0.2'", 'g'), "apiVersion: '0.0.3'");
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: "0.0.2"', 'g'), 'apiVersion: "0.0.3"');
     },
 };

package/dist/migrations/mapping_api_version_0_0_3.js

@@ -26,16 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const semver_1 = __importDefault(require("semver"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 const versions_1 = require("./util/versions");
 // If any of the manifest apiVersions are 0.0.3, replace them with 0.0.4
 exports.default = {
     name: 'Bump mapping apiVersion from 0.0.3 to 0.0.4',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ sourceDir, manifestFile, }) => {
         // Obtain the graph-ts version, if possible
         let graphTsVersion;
         try {
@@ -71,8 +69,14 @@ exports.default = {
         // and replace the values in the data structures here; unfortunately
         // writing that back to the file messes with the formatting more than
         // we'd like; that's why for now, we use a simple patching approach
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: 0.0.3', 'g'), 'apiVersion: 0.0.4');
-        await toolbox.patching.replace(manifestFile, new RegExp("apiVersion: '0.0.3'", 'g'), "apiVersion: '0.0.4'");
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: "0.0.3"', 'g'), 'apiVersion: "0.0.4"');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: 0.0.3', 'g'), 'apiVersion: 0.0.4');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp("apiVersion: '0.0.3'", 'g'), "apiVersion: '0.0.4'");
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: "0.0.3"', 'g'), 'apiVersion: "0.0.4"');
     },
 };

package/dist/migrations/mapping_api_version_0_0_4.js

@@ -26,16 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const semver_1 = __importDefault(require("semver"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 const versions_1 = require("./util/versions");
 // If any of the manifest apiVersions are 0.0.4, replace them with 0.0.5
 exports.default = {
     name: 'Bump mapping apiVersion from 0.0.4 to 0.0.5',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ sourceDir, manifestFile, }) => {
         // Obtain the graph-ts version, if possible
         let graphTsVersion;
         try {
@@ -73,8 +71,14 @@ exports.default = {
         // and replace the values in the data structures here; unfortunately
         // writing that back to the file messes with the formatting more than
         // we'd like; that's why for now, we use a simple patching approach
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: 0.0.4', 'g'), 'apiVersion: 0.0.5');
-        await toolbox.patching.replace(manifestFile, new RegExp("apiVersion: '0.0.4'", 'g'), "apiVersion: '0.0.5'");
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: "0.0.4"', 'g'), 'apiVersion: "0.0.5"');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: 0.0.4', 'g'), 'apiVersion: 0.0.5');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp("apiVersion: '0.0.4'", 'g'), "apiVersion: '0.0.5'");
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: "0.0.4"', 'g'), 'apiVersion: "0.0.5"');
     },
 };

package/dist/migrations/mapping_api_version_0_0_5.js

@@ -26,16 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const semver_1 = __importDefault(require("semver"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 const versions_1 = require("./util/versions");
 // If any of the manifest apiVersions are 0.0.5, replace them with 0.0.6
 exports.default = {
     name: 'Bump mapping apiVersion from 0.0.5 to 0.0.6',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ sourceDir, manifestFile, }) => {
         // Obtain the graph-ts version, if possible
         let graphTsVersion;
         try {
@@ -73,8 +71,14 @@ exports.default = {
         // and replace the values in the data structures here; unfortunately
         // writing that back to the file messes with the formatting more than
         // we'd like; that's why for now, we use a simple patching approach
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: 0.0.5', 'g'), 'apiVersion: 0.0.6');
-        await toolbox.patching.replace(manifestFile, new RegExp("apiVersion: '0.0.5'", 'g'), "apiVersion: '0.0.6'");
-        await toolbox.patching.replace(manifestFile, new RegExp('apiVersion: "0.0.5"', 'g'), 'apiVersion: "0.0.6"');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: 0.0.5', 'g'), 'apiVersion: 0.0.6');
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp("apiVersion: '0.0.5'", 'g'), "apiVersion: '0.0.6'");
+        await toolbox.patching.replace(manifestFile, 
+        // @ts-expect-error toolbox patching seems to accept RegExp
+        new RegExp('apiVersion: "0.0.5"', 'g'), 'apiVersion: "0.0.6"');
     },
 };

package/dist/migrations/spec_version_0_0_2.js

@@ -22,19 +22,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 // Spec version to 0.0.2 uses top level templates. graph-cli no longer supports
 // 0.0.1 which used nested templates.
 exports.default = {
     name: 'Bump manifest specVersion from 0.0.1 to 0.0.2',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ manifestFile }) => {
         let manifest = await (0, load_manifest_1.loadManifest)(manifestFile);
         return (manifest &&
             typeof manifest === 'object' &&

package/dist/migrations/spec_version_0_0_3.js

@@ -22,13 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const toolbox = __importStar(require("gluegun/toolbox"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const toolbox = __importStar(require("gluegun"));
 const load_manifest_1 = require("./util/load-manifest");
 // Spec version 0.0.4 uses feature management, but features are
 // detected and validated by the graph-node instance during subgraph
@@ -38,7 +33,7 @@ const load_manifest_1 = require("./util/load-manifest");
 // non-canonical.
 exports.default = {
     name: 'Bump manifest specVersion from 0.0.2 to 0.0.4',
-    predicate: async ({ sourceDir, manifestFile }) => {
+    predicate: async ({ manifestFile }) => {
         let manifest = await (0, load_manifest_1.loadManifest)(manifestFile);
         return (manifest &&
             typeof manifest === 'object' &&

package/dist/migrations/util/versions.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGraphTsVersion = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const getGraphTsVersion = async (sourceDir) => {
+async function getGraphTsVersion(sourceDir) {
     let graphTsPath;
     for (let dir = path_1.default.resolve(sourceDir); 
     // Terminate after the root dir or when we have found node_modules
@@ -23,7 +22,7 @@ const getGraphTsVersion = async (sourceDir) => {
     }
     let pkgJsonFile = path_1.default.join(graphTsPath, 'package.json');
     let data = await fs_extra_1.default.readFile(pkgJsonFile);
-    let jsonData = JSON.parse(data);
+    let jsonData = JSON.parse(data.toString());
     return jsonData.version;
-};
+}
 exports.getGraphTsVersion = getGraphTsVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.37.3-alpha-20230111132934-b4190fb",
+  "version": "0.37.3-alpha-20230111134832-100975c",
   "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "main": "dist/cli.js",
@@ -40,6 +40,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^26.0.24",
     "@types/js-yaml": "^3.12.7",
+    "@types/semver": "^7.3.13",
     "@types/which": "^2.0.1",
     "copyfiles": "^2.4.1",
     "jest": "26.0.0",

package/src/migrations/{mapping_api_version_0_0_1.js → mapping_api_version_0_0_1.ts}

@@ -1,14 +1,18 @@
-import fs from 'fs-extra'
 import semver from 'semver'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { getGraphTsVersion } from './util/versions'
 import { loadManifest } from './util/load-manifest'
 
 // If any of the manifest apiVersions are 0.0.1, replace them with 0.0.2
 export default {
   name: 'Bump mapping apiVersion from 0.0.1 to 0.0.2',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({
+    sourceDir,
+    manifestFile,
+  }: {
+    sourceDir: string
+    manifestFile: string
+  }) => {
     // Obtain the graph-ts version, if possible
     let graphTsVersion
     try {
@@ -28,7 +32,7 @@ export default {
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
       (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
+        (hasOldMappings: boolean, dataSource: any) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
             dataSource.mapping &&
@@ -38,7 +42,7 @@ export default {
       ) ||
         (Array.isArray(manifest.templates) &&
           manifest.templates.reduce(
-            (hasOldMappings, template) =>
+            (hasOldMappings: boolean, template: any) =>
               hasOldMappings ||
               (typeof template === 'object' &&
                 template.mapping &&
@@ -48,23 +52,26 @@ export default {
           )))
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     // Make sure we catch all variants; we could load the manifest
     // and replace the values in the data structures here; unfortunately
     // writing that back to the file messes with the formatting more than
     // we'd like; that's why for now, we use a simple patching approach
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: 0.0.1', 'g'),
       'apiVersion: 0.0.2',
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp("apiVersion: '0.0.1'", 'g'),
       "apiVersion: '0.0.2'",
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: "0.0.1"', 'g'),
       'apiVersion: "0.0.2"',
     )

package/src/migrations/{mapping_api_version_0_0_2.js → mapping_api_version_0_0_2.ts}

@@ -1,12 +1,18 @@
 import semver from 'semver'
-import * as toolbox from 'gluegun/toolbox'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 import { getGraphTsVersion } from './util/versions'
 
 // If any of the manifest apiVersions are 0.0.2, replace them with 0.0.3
 export default {
   name: 'Bump mapping apiVersion from 0.0.2 to 0.0.3',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({
+    sourceDir,
+    manifestFile,
+  }: {
+    sourceDir: string
+    manifestFile: string
+  }) => {
     // Obtain the graph-ts version, if possible
     let graphTsVersion
     try {
@@ -26,7 +32,7 @@ export default {
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
       (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
+        (hasOldMappings: boolean, dataSource: any) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
             dataSource.mapping &&
@@ -36,7 +42,7 @@ export default {
       ) ||
         (Array.isArray(manifest.templates) &&
           manifest.templates.reduce(
-            (hasOldMappings, template) =>
+            (hasOldMappings: boolean, template: any) =>
               hasOldMappings ||
               (typeof template === 'object' &&
                 template.mapping &&
@@ -46,23 +52,26 @@ export default {
           )))
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     // Make sure we catch all variants; we could load the manifest
     // and replace the values in the data structures here; unfortunately
     // writing that back to the file messes with the formatting more than
     // we'd like; that's why for now, we use a simple patching approach
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: 0.0.2', 'g'),
       'apiVersion: 0.0.3',
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp("apiVersion: '0.0.2'", 'g'),
       "apiVersion: '0.0.3'",
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: "0.0.2"', 'g'),
       'apiVersion: "0.0.3"',
     )

package/src/migrations/{mapping_api_version_0_0_3.js → mapping_api_version_0_0_3.ts}

@@ -1,14 +1,18 @@
-import fs from 'fs-extra'
 import semver from 'semver'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 import { getGraphTsVersion } from './util/versions'
 
 // If any of the manifest apiVersions are 0.0.3, replace them with 0.0.4
 export default {
   name: 'Bump mapping apiVersion from 0.0.3 to 0.0.4',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({
+    sourceDir,
+    manifestFile,
+  }: {
+    sourceDir: string
+    manifestFile: string
+  }) => {
     // Obtain the graph-ts version, if possible
     let graphTsVersion
     try {
@@ -28,7 +32,7 @@ export default {
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
       (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
+        (hasOldMappings: boolean, dataSource: any) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
             dataSource.mapping &&
@@ -38,7 +42,7 @@ export default {
       ) ||
         (Array.isArray(manifest.templates) &&
           manifest.templates.reduce(
-            (hasOldMappings, template) =>
+            (hasOldMappings: boolean, template: any) =>
               hasOldMappings ||
               (typeof template === 'object' &&
                 template.mapping &&
@@ -48,23 +52,26 @@ export default {
           )))
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     // Make sure we catch all variants; we could load the manifest
     // and replace the values in the data structures here; unfortunately
     // writing that back to the file messes with the formatting more than
     // we'd like; that's why for now, we use a simple patching approach
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: 0.0.3', 'g'),
       'apiVersion: 0.0.4',
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp("apiVersion: '0.0.3'", 'g'),
       "apiVersion: '0.0.4'",
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: "0.0.3"', 'g'),
       'apiVersion: "0.0.4"',
     )

package/src/migrations/{mapping_api_version_0_0_4.js → mapping_api_version_0_0_4.ts}

@@ -1,14 +1,18 @@
-import fs from 'fs-extra'
 import semver from 'semver'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 import { getGraphTsVersion } from './util/versions'
 
 // If any of the manifest apiVersions are 0.0.4, replace them with 0.0.5
 export default {
   name: 'Bump mapping apiVersion from 0.0.4 to 0.0.5',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({
+    sourceDir,
+    manifestFile,
+  }: {
+    sourceDir: string
+    manifestFile: string
+  }) => {
     // Obtain the graph-ts version, if possible
     let graphTsVersion
     try {
@@ -24,13 +28,13 @@ export default {
       // Only migrate if the graph-ts version is >= 0.22.0...
       // Coerce needed because we may be dealing with an alpha version
       // and in the `semver` library this would not return true on equality.
-      semver.gte(semver.coerce(graphTsVersion), '0.22.0') &&
+      semver.gte(semver.coerce(graphTsVersion)!, '0.22.0') &&
       // ...and we have a manifest with mapping > apiVersion = 0.0.4
       manifest &&
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
       (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
+        (hasOldMappings: boolean, dataSource: any) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
             dataSource.mapping &&
@@ -40,7 +44,7 @@ export default {
       ) ||
         (Array.isArray(manifest.templates) &&
           manifest.templates.reduce(
-            (hasOldMappings, template) =>
+            (hasOldMappings: boolean, template: any) =>
               hasOldMappings ||
               (typeof template === 'object' &&
                 template.mapping &&
@@ -50,23 +54,26 @@ export default {
           )))
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     // Make sure we catch all variants; we could load the manifest
     // and replace the values in the data structures here; unfortunately
     // writing that back to the file messes with the formatting more than
     // we'd like; that's why for now, we use a simple patching approach
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: 0.0.4', 'g'),
       'apiVersion: 0.0.5',
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp("apiVersion: '0.0.4'", 'g'),
       "apiVersion: '0.0.5'",
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: "0.0.4"', 'g'),
       'apiVersion: "0.0.5"',
     )

package/src/migrations/{mapping_api_version_0_0_5.js → mapping_api_version_0_0_5.ts}

@@ -1,14 +1,18 @@
-import fs from 'fs-extra'
 import semver from 'semver'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 import { getGraphTsVersion } from './util/versions'
 
 // If any of the manifest apiVersions are 0.0.5, replace them with 0.0.6
 export default {
   name: 'Bump mapping apiVersion from 0.0.5 to 0.0.6',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({
+    sourceDir,
+    manifestFile,
+  }: {
+    sourceDir: string
+    manifestFile: string
+  }) => {
     // Obtain the graph-ts version, if possible
     let graphTsVersion
     try {
@@ -24,13 +28,13 @@ export default {
       // Only migrate if the graph-ts version is >= 0.24.0...
       // Coerce needed because we may be dealing with an alpha version
       // and in the `semver` library this would not return true on equality.
-      semver.gte(semver.coerce(graphTsVersion), '0.24.0') &&
+      semver.gte(semver.coerce(graphTsVersion)!, '0.24.0') &&
       // ...and we have a manifest with mapping > apiVersion = 0.0.5
       manifest &&
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
       (manifest.dataSources.reduce(
-        (hasOldMappings, dataSource) =>
+        (hasOldMappings: boolean, dataSource: any) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
             dataSource.mapping &&
@@ -40,7 +44,7 @@ export default {
       ) ||
         (Array.isArray(manifest.templates) &&
           manifest.templates.reduce(
-            (hasOldMappings, template) =>
+            (hasOldMappings: boolean, template: any) =>
               hasOldMappings ||
               (typeof template === 'object' &&
                 template.mapping &&
@@ -50,23 +54,26 @@ export default {
           )))
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     // Make sure we catch all variants; we could load the manifest
     // and replace the values in the data structures here; unfortunately
     // writing that back to the file messes with the formatting more than
     // we'd like; that's why for now, we use a simple patching approach
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: 0.0.5', 'g'),
       'apiVersion: 0.0.6',
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp("apiVersion: '0.0.5'", 'g'),
       "apiVersion: '0.0.6'",
     )
     await toolbox.patching.replace(
       manifestFile,
+      // @ts-expect-error toolbox patching seems to accept RegExp
       new RegExp('apiVersion: "0.0.5"', 'g'),
       'apiVersion: "0.0.6"',
     )

package/src/migrations/{spec_version_0_0_2.js → spec_version_0_0_2.ts}

@@ -1,13 +1,11 @@
-import fs from 'fs-extra'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 
 // Spec version to 0.0.2 uses top level templates. graph-cli no longer supports
 // 0.0.1 which used nested templates.
 export default {
   name: 'Bump manifest specVersion from 0.0.1 to 0.0.2',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({ manifestFile }: { manifestFile: string }) => {
     let manifest = await loadManifest(manifestFile)
     return (
       manifest &&
@@ -16,7 +14,7 @@ export default {
       manifest.specVersion === '0.0.1'
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     await toolbox.patching.replace(
       manifestFile,
       'specVersion: 0.0.1',

package/src/migrations/{spec_version_0_0_3.js → spec_version_0_0_3.ts}

@@ -1,6 +1,4 @@
-import fs from 'fs-extra'
-import * as toolbox from 'gluegun/toolbox'
-import yaml from 'js-yaml'
+import * as toolbox from 'gluegun'
 import { loadManifest } from './util/load-manifest'
 
 // Spec version 0.0.4 uses feature management, but features are
@@ -11,7 +9,7 @@ import { loadManifest } from './util/load-manifest'
 // non-canonical.
 export default {
   name: 'Bump manifest specVersion from 0.0.2 to 0.0.4',
-  predicate: async ({ sourceDir, manifestFile }) => {
+  predicate: async ({ manifestFile }: { manifestFile: string }) => {
     let manifest = await loadManifest(manifestFile)
     return (
       manifest &&
@@ -20,7 +18,7 @@ export default {
       (manifest.specVersion === '0.0.2' || manifest.specVersion === '0.0.3')
     )
   },
-  apply: async ({ manifestFile }) => {
+  apply: async ({ manifestFile }: { manifestFile: string }) => {
     await toolbox.patching.patch(manifestFile, {
       insert: 'specVersion: 0.0.4',
       replace: new RegExp(`specVersion: ['"]?0.0.[23]['"]?`),

package/src/migrations/util/{load-manifest.js → load-manifest.ts}

@@ -2,12 +2,10 @@ import fs from 'fs-extra'
 import path from 'path'
 import yaml from 'js-yaml'
 
-async function loadManifest(manifestFile) {
+export async function loadManifest(manifestFile: string) {
   if (manifestFile.match(/.js$/)) {
     return require(path.resolve(manifestFile))
   } else {
     return yaml.safeLoad(await fs.readFile(manifestFile, 'utf-8'))
   }
 }
-
-export { loadManifest }

package/src/migrations/util/{versions.js → versions.ts}

@@ -1,12 +1,11 @@
 import path from 'path'
 import fs from 'fs-extra'
-import yaml from 'js-yaml'
 
-const getGraphTsVersion = async sourceDir => {
-  let graphTsPath
+export async function getGraphTsVersion(sourceDir: string) {
+  let graphTsPath!: string
 
   for (
-    let dir = path.resolve(sourceDir);
+    let dir: string | undefined = path.resolve(sourceDir);
     // Terminate after the root dir or when we have found node_modules
     dir !== undefined;
     // Continue with the parent directory, terminate after the root dir
@@ -28,8 +27,6 @@ const getGraphTsVersion = async sourceDir => {
 
   let pkgJsonFile = path.join(graphTsPath, 'package.json')
   let data = await fs.readFile(pkgJsonFile)
-  let jsonData = JSON.parse(data)
+  let jsonData = JSON.parse(data.toString())
   return jsonData.version
 }
-
-export { getGraphTsVersion }