@graphprotocol/graph-cli 0.70.0 → 0.71.0-alpha-20240423051530-6bf79b9

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @graphprotocol/graph-cli
 
+## 0.71.0-alpha-20240423051530-6bf79b9
+
+### Minor Changes
+
+- [#1598](https://github.com/graphprotocol/graph-tooling/pull/1598)
+  [`7d4208a`](https://github.com/graphprotocol/graph-tooling/commit/7d4208aa1a1d376d7b230df7d86d9ec5864e18a8)
+  Thanks [@incrypto32](https://github.com/incrypto32)! - Allow topic filters in event handlers
+
+### Patch Changes
+
+- [#1634](https://github.com/graphprotocol/graph-tooling/pull/1634)
+  [`f256475`](https://github.com/graphprotocol/graph-tooling/commit/f2564757ba8007025f8745c9162ba4143ff58548)
+  Thanks [@joshuanazareth97](https://github.com/joshuanazareth97)! - Order list of evm chains in
+  graph init command
+
 ## 0.70.0
 
 ### Minor Changes

package/dist/command-helpers/abi.js

@@ -192,6 +192,14 @@ const getEtherscanLikeAPIUrl = (network) => {
             return `https://api.routescan.io/v2/network/mainnet/evm/81457/etherscan/api`;
         case 'etherlink-testnet':
             return `https://testnet-explorer.etherlink.com/api`;
+        case 'polygon-amoy':
+            return `https://api-amoy.polygonscan.com/api`;
+        case 'gnosis-chiado':
+            return `https://gnosis-chiado.blockscout.com/api`;
+        case 'mode-mainnet':
+            return `https://explorer.mode.network/api`;
+        case 'mode-sepolia':
+            return `https://sepolia.explorer.mode.network/api`;
         default:
             return `https://api-${network}.etherscan.io/api`;
     }
@@ -288,6 +296,14 @@ const getPublicRPCEndpoint = (network) => {
             return 'https://sepolia.optimism.io';
         case 'etherlink-testnet':
             return `https://node.ghostnet.etherlink.com`;
+        case 'polygon-amoy':
+            return `https://rpc-amoy.polygon.technology`;
+        case 'gnosis-chiado':
+            return `https://rpc.chiadochain.net`;
+        case 'mode-mainnet':
+            return `https://mainnet.mode.network`;
+        case 'mode-sepolia':
+            return `https://sepolia.mode.network`;
         default:
             throw new Error(`Unknown network: ${network}`);
     }

package/dist/command-helpers/sort.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Sorts an array with specified elements given priority.
+ * Use a predicate function, or provide an array to prioritise elements.
+ * If no compare function is provided, default JS sorting (ascending) behaviour prevails.
+ *
+ * @param {T[]} array - The array to be sorted.
+ * @param {((element: T) => boolean) | T[]} prioritySpecifier - A function that returns true if an element should be prioritized, or an array of elements to be prioritized.
+ * @param {(a: T, b: T) => number} [compareFunction] - An optional comparison function to sort the elements of the array. If omitted, the array is sorted in default order.
+ * @returns {T[]} The sorted array with priority elements first.
+ *
+ * @example
+ * const numbers = [5, 3, 9, 1, 4];
+ * sortWithPriority(numbers, x => x > 5); // [9, 1, 3, 4, 5]
+ * sortWithPriority(numbers, [9, 1]); // [1, 9, 3, 4, 5]
+ */
+declare function sortWithPriority<T>(array: T[], prioritySpecifier?: ((element: T) => boolean) | T[], compareFunction?: (a: T, b: T) => number): T[];
+export { sortWithPriority };

package/dist/command-helpers/sort.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortWithPriority = void 0;
+/**
+ * Sorts an array with specified elements given priority.
+ * Use a predicate function, or provide an array to prioritise elements.
+ * If no compare function is provided, default JS sorting (ascending) behaviour prevails.
+ *
+ * @param {T[]} array - The array to be sorted.
+ * @param {((element: T) => boolean) | T[]} prioritySpecifier - A function that returns true if an element should be prioritized, or an array of elements to be prioritized.
+ * @param {(a: T, b: T) => number} [compareFunction] - An optional comparison function to sort the elements of the array. If omitted, the array is sorted in default order.
+ * @returns {T[]} The sorted array with priority elements first.
+ *
+ * @example
+ * const numbers = [5, 3, 9, 1, 4];
+ * sortWithPriority(numbers, x => x > 5); // [9, 1, 3, 4, 5]
+ * sortWithPriority(numbers, [9, 1]); // [1, 9, 3, 4, 5]
+ */
+function sortWithPriority(array, prioritySpecifier, compareFunction) {
+    // prioritySpecifier can be an array or a function so handle each case
+    let isPriorityElement;
+    if (Array.isArray(prioritySpecifier) || !prioritySpecifier) {
+        const prioritySet = new Set(prioritySpecifier ?? []);
+        isPriorityElement = (element) => prioritySet.has(element);
+    }
+    else {
+        isPriorityElement = prioritySpecifier;
+    }
+    const priorityArray = array.filter(isPriorityElement);
+    const regularArray = array.filter(item => !isPriorityElement(item));
+    if (compareFunction) {
+        priorityArray.sort(compareFunction);
+        regularArray.sort(compareFunction);
+    }
+    else {
+        priorityArray.sort();
+        regularArray.sort();
+    }
+    return priorityArray.concat(regularArray);
+}
+exports.sortWithPriority = sortWithPriority;

package/dist/command-helpers/sort.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/command-helpers/sort.test.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const sort_1 = require("./sort"); // adjust the import based on your file structure
+(0, vitest_1.describe)('sortWithPriority', () => {
+    (0, vitest_1.it)('should sort numbers with specific priority elements', () => {
+        const numbers = [5, 3, 9, 1, 4];
+        const priorityNumbers = [9, 1];
+        const result = (0, sort_1.sortWithPriority)(numbers, priorityNumbers);
+        (0, vitest_1.expect)(result).toEqual([1, 9, 3, 4, 5]);
+    });
+    (0, vitest_1.it)('should default sort numbers if no priority specifier', () => {
+        const numbers = [5, 3, 9, 1, 4];
+        const result = (0, sort_1.sortWithPriority)(numbers);
+        (0, vitest_1.expect)(result).toEqual([1, 3, 4, 5, 9]);
+    });
+    (0, vitest_1.it)('should sort strings with priority determined by a function', () => {
+        const fruits = ['apple', 'orange', 'banana', 'mango', 'kiwi', 'melon'];
+        const sortedFruits = (0, sort_1.sortWithPriority)(fruits, fruit => fruit.startsWith('m'));
+        (0, vitest_1.expect)(sortedFruits).toEqual(['mango', 'melon', 'apple', 'banana', 'kiwi', 'orange']);
+    });
+    (0, vitest_1.it)('should handle an empty array', () => {
+        const emptyArray = [];
+        const result = (0, sort_1.sortWithPriority)(emptyArray, x => x > 3);
+        (0, vitest_1.expect)(result).toEqual([]);
+    });
+    (0, vitest_1.it)('should sort using a custom compare function', () => {
+        const numbers = [5, 3, 9, 1, 4];
+        const priorityNumbers = [9, 1];
+        const result = (0, sort_1.sortWithPriority)(numbers, priorityNumbers, (a, b) => a - b);
+        (0, vitest_1.expect)(result).toEqual([1, 9, 3, 4, 5]);
+    });
+});

package/dist/commands/init.js

@@ -29,13 +29,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const gluegun_1 = require("gluegun");
 const toolbox = __importStar(require("gluegun"));
+const gluegun_1 = require("gluegun");
 const core_1 = require("@oclif/core");
 const abi_1 = require("../command-helpers/abi");
 const network_1 = require("../command-helpers/network");
 const node_1 = require("../command-helpers/node");
 const scaffold_1 = require("../command-helpers/scaffold");
+const sort_1 = require("../command-helpers/sort");
 const spinner_1 = require("../command-helpers/spinner");
 const subgraph_1 = require("../command-helpers/subgraph");
 const constants_1 = require("../constants");
@@ -501,10 +502,11 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
                     : true,
             },
         ]);
-        const choices = (await AVAILABLE_NETWORKS())?.[product === 'subgraph-studio' ? 'studio' : 'hostedService'];
+        let choices = (await AVAILABLE_NETWORKS())?.[product === 'subgraph-studio' ? 'studio' : 'hostedService'];
         if (!choices) {
             this.error('Unable to fetch available networks from API. Please report this issue. As a workaround you can pass `--network` flag from the available networks: https://thegraph.com/docs/en/developing/supported-networks', { exit: 1 });
         }
+        choices = (0, sort_1.sortWithPriority)(choices, ['mainnet']);
         const { network } = await gluegun_1.prompt.ask([
             {
                 type: 'select',

package/dist/protocols/ethereum/manifest.graphql

@@ -95,6 +95,9 @@ type CallHandler {
 type ContractEventHandler {
   event: String!
   topic0: String
+  topic1: [String]
+  topic2: [String]
+  topic3: [String]
   handler: String!
   receipt: Boolean
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.70.0",
+  "version": "0.71.0-alpha-20240423051530-6bf79b9",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.70.0",
+  "version": "0.71.0-alpha-20240423051530-6bf79b9",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {