@graphprotocol/graph-cli 0.63.0-alpha-20231206152354-981f2bb → 0.63.0-alpha-20231206164429-cdb032a

package/CHANGELOG.md

@@ -1,13 +1,9 @@
 # @graphprotocol/graph-cli
 
-## 0.63.0-alpha-20231206152354-981f2bb
+## 0.63.0-alpha-20231206164429-cdb032a
 
 ### Minor Changes
 
-- [#1490](https://github.com/graphprotocol/graph-tooling/pull/1490)
-  [`3fa19c5`](https://github.com/graphprotocol/graph-tooling/commit/3fa19c5b212bff03d57b027f1dbdf80090e69b02)
-  Thanks [@mangas](https://github.com/mangas)! - substreams based triggers support
-
 - [#1524](https://github.com/graphprotocol/graph-tooling/pull/1524)
   [`086a2da`](https://github.com/graphprotocol/graph-tooling/commit/086a2da03a4388277b69b6db541a0673dc9505bb)
   Thanks [@pedropregueiro](https://github.com/pedropregueiro)! - Add support for M3 apple silicon

package/README.md

@@ -68,6 +68,16 @@ If you are ready to dive into the details of building a subgraph from scratch, t
 well, along with API documentation for the
 [AssemblyScript API](https://thegraph.com/docs/en/developer/assemblyscript-api/).
 
+## Releases
+
+The Graph CLI is released on [npm](https://www.npmjs.com/package/@graphprotocol/graph-cli) and published as a Binary on [GitHub Releases](https://github.com/graphprotocol/graph-tooling/releases). We support all the version of CLI that support [Maintenance, LTS and Current Node.js releases](https://github.com/nodejs/Release#release-schedule). Additionally if there are `graph-node` specific features that are breaking and no-longer supported, we will drop support for older versions of CLI. After 90 days of a new `Node.js` release, we will drop support for the oldest `Node.js` version.
+
+End-of-life Releases
+
+| Release    | End-of-life       | Reason                                |
+| ---------- | ----------------- | ------------------------------------- |
+| `>=0.60.0` | December 31, 2023 | No longer supporting Node 16 or lower |
+
 ## License
 
 Copyright © 2018-2019 Graph Protocol, Inc. and contributors.

package/dist/compiler/index.js

@@ -374,7 +374,7 @@ class Compiler {
                         return path_1.default.relative(this.options.outputDir, this._writeSubgraphFile(abiFile, JSON.stringify(abiData.data.toJS(), null, 2), this.sourceDir, this.subgraphDir(this.options.outputDir, dataSource), spinner));
                     })));
                 }
-                if (protocol.name == 'substreams' || protocol.name == 'substreams/triggers') {
+                if (protocol.name == 'substreams') {
                     updatedDataSource = updatedDataSource
                         // Write data source ABIs to the output directory
                         .updateIn(['source', 'package'], (substreamsPackage) => substreamsPackage.update('file', (packageFile) => {
@@ -382,9 +382,6 @@ class Compiler {
                         const packageContent = fs_extra_1.default.readFileSync(packageFile);
                         return path_1.default.relative(this.options.outputDir, this._writeSubgraphFile(packageFile, packageContent, this.sourceDir, this.subgraphDir(this.options.outputDir, dataSource), spinner));
                     }));
-                    if (updatedDataSource.getIn(['mapping', 'file'])) {
-                        updatedDataSource = updatedDataSource.updateIn(['mapping', 'file'], (mappingFile) => path_1.default.relative(this.options.outputDir, path_1.default.resolve(this.sourceDir, mappingFile)));
-                    }
                     return updatedDataSource;
                 }
                 // The mapping file is already being written to the output
@@ -438,18 +435,12 @@ class Compiler {
                 }
             }
             // Upload all mappings
-            if (this.protocol.name === 'substreams' || this.protocol.name === 'substreams/triggers') {
+            if (this.protocol.name === 'substreams') {
                 for (const [i, dataSource] of subgraph.get('dataSources').entries()) {
                     updates.push({
                         keyPath: ['dataSources', i, 'source', 'package', 'file'],
                         value: await this._uploadFileToIPFS(dataSource.getIn(['source', 'package', 'file']), uploadedFiles, spinner),
                     });
-                    if (dataSource.getIn(['mapping', 'file'])) {
-                        updates.push({
-                            keyPath: ['dataSources', i, 'mapping', 'file'],
-                            value: await this._uploadFileToIPFS(dataSource.getIn(['mapping', 'file']), uploadedFiles, spinner),
-                        });
-                    }
                 }
             }
             else {

package/dist/protocols/index.d.ts

@@ -6,9 +6,9 @@ export default class Protocol {
     static fromDataSources(dataSourcesAndTemplates: any): Protocol;
     name: ProtocolName;
     config: ProtocolConfig;
-    constructor(datasource: any);
+    constructor(name: ProtocolName);
     static availableProtocols(): immutable.Collection<ProtocolName, string[]>;
-    static availableNetworks(): immutable.Map<"ethereum" | "arweave" | "near" | "cosmos" | "substreams" | "substreams/triggers", immutable.List<string>>;
+    static availableNetworks(): immutable.Map<"ethereum" | "arweave" | "near" | "cosmos" | "substreams", immutable.List<string>>;
     static normalizeName(name: ProtocolName): ProtocolName;
     displayName(): string;
     isValidKindName(kind: string): boolean;
@@ -25,7 +25,7 @@ export default class Protocol {
     getManifestScaffold(): any;
     getMappingScaffold(): any;
 }
-export type ProtocolName = 'arweave' | 'ethereum' | 'near' | 'cosmos' | 'substreams' | 'substreams/triggers';
+export type ProtocolName = 'arweave' | 'ethereum' | 'near' | 'cosmos' | 'substreams';
 export interface ProtocolConfig {
     displayName: string;
     abi?: any;

package/dist/protocols/index.js

@@ -50,18 +50,11 @@ const subgraph_5 = __importDefault(require("./substreams/subgraph"));
 const protocolDebug = (0, debug_1.default)('graph-cli:protocol');
 class Protocol {
     static fromDataSources(dataSourcesAndTemplates) {
-        const firstDataSource = dataSourcesAndTemplates[0];
-        return new Protocol(firstDataSource);
+        const firstDataSourceKind = dataSourcesAndTemplates[0].kind;
+        return new Protocol(firstDataSourceKind);
     }
-    constructor(datasource) {
-        /**
-         * TODO: we should improve this `any` type, because some places
-         * we can initiate a Protocol with just a string (the name) and
-         * some other places use datasource object
-         */
-        const name = typeof datasource === 'string' ? datasource : datasource.kind;
+    constructor(name) {
         this.name = Protocol.normalizeName(name);
-        protocolDebug('Initializing protocol %s', this.name);
         switch (this.name) {
             case 'arweave':
                 this.config = arweaveProtocol;
@@ -77,13 +70,6 @@ class Protocol {
                 break;
             case 'substreams':
                 this.config = substreamsProtocol;
-                /**
-                 * Substreams triggers are a special case of substreams data sources
-                 * which have a mapping file and a handler.
-                 */
-                if (datasource?.mapping?.file && datasource?.mapping.handler) {
-                    this.name = 'substreams/triggers';
-                }
                 break;
             default:
             // Do not throw when undefined, a better error message is printed after the constructor

package/dist/protocols/substreams/manifest.graphql

@@ -32,18 +32,14 @@ type DataSource {
 
 type SubstreamsSource {
   package: SubstreamsPackage!
-  startBlock: BigInt
 }
 
 type SubstreamsPackage {
   moduleName: String!
   file: String!
-  params: String
 }
 
 type SubstreamMapping {
   apiVersion: String!
   kind: String!
-  file: File
-  handler: String
 }

package/dist/subgraph.js

@@ -60,9 +60,7 @@ class Subgraph {
             ]);
         }
         // Parse the default subgraph schema
-        const schema = graphql.parse(await fs_extra_1.default.readFile(path_1.default.join(__dirname, 'protocols', 
-        // TODO: substreams/triggers is a special case, should be handled better
-        protocol.name === 'substreams/triggers' ? 'substreams' : protocol.name, `manifest.graphql`), 'utf-8'));
+        const schema = graphql.parse(await fs_extra_1.default.readFile(path_1.default.join(__dirname, 'protocols', protocol.name, `manifest.graphql`), 'utf-8'));
         // Obtain the root `SubgraphManifest` type from the schema
         const rootType = schema.definitions.find(definition => {
             // @ts-expect-error TODO: name field does not exist on definition, really?

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.63.0-alpha-20231206152354-981f2bb",
+  "version": "0.63.0-alpha-20231206164429-cdb032a",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.63.0-alpha-20231206152354-981f2bb",
+  "version": "0.63.0-alpha-20231206164429-cdb032a",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {