@graphprotocol/graph-cli 0.54.0-alpha-20230724180700-d5ce4e2 → 0.54.0-alpha-20230801202859-9fcb823

package/CHANGELOG.md

@@ -1,20 +1,22 @@
 # @graphprotocol/graph-cli
 
-## 0.54.0-alpha-20230724180700-d5ce4e2
+## 0.54.0-alpha-20230801202859-9fcb823
 
 ### Minor Changes
 
+- [#1411](https://github.com/graphprotocol/graph-tooling/pull/1411)
+  [`9fcb823`](https://github.com/graphprotocol/graph-tooling/commit/9fcb823b86862c52b55c92c28fb4ef5e2b249417)
+  Thanks [@saihaj](https://github.com/saihaj)! - add support for arweave file datasource
+
 - [#1407](https://github.com/graphprotocol/graph-tooling/pull/1407)
   [`d388127`](https://github.com/graphprotocol/graph-tooling/commit/d388127aa46a47feaab5024d0a2f2da49c9cabac)
   Thanks [@saihaj](https://github.com/saihaj)! - add skipInstall flag for init
 
 ### Patch Changes
 
-- [#1394](https://github.com/graphprotocol/graph-tooling/pull/1394)
-  [`a2a6ae6`](https://github.com/graphprotocol/graph-tooling/commit/a2a6ae697ae93631e020c8583d7c04a338d3c298)
-  Thanks [@saihaj](https://github.com/saihaj)! - dependencies updates:
-  - Added dependency [`zod@^3.21.4` ↗︎](https://www.npmjs.com/package/zod/v/3.21.4) (to
-    `dependencies`)
+- [#1410](https://github.com/graphprotocol/graph-tooling/pull/1410)
+  [`c1eed12`](https://github.com/graphprotocol/graph-tooling/commit/c1eed1219b015145bd428c201577659c61ab64bc)
+  Thanks [@uF4No](https://github.com/uF4No)! - fix ABI api endpoint zksync mainnet
 
 ## 0.53.0
 

package/dist/codegen/template.js

@@ -37,9 +37,12 @@ class DataSourceTemplateCodeGenerator {
         if (kind.split('/')[0] == protocol.name) {
             this.protocolTemplateCodeGen = protocol.getTemplateCodeGen(template);
         }
-        else if (kind == 'file/ipfs') {
+        else if (kind == 'file/ipfs' || kind == 'file/arweave') {
             this.protocolTemplateCodeGen = new file_template_1.default(template);
         }
+        else {
+            throw new Error(`DataSourceTemplate kind not supported: ${kind}`);
+        }
     }
     generateModuleImports() {
         return [
@@ -55,7 +58,10 @@ class DataSourceTemplateCodeGenerator {
     }
     _generateTemplateType() {
         const name = this.template.get('name');
-        const klass = tsCodegen.klass(name, { export: true, extends: 'DataSourceTemplate' });
+        const klass = tsCodegen.klass(name, {
+            export: true,
+            extends: 'DataSourceTemplate',
+        });
         klass.addMethod(this.protocolTemplateCodeGen.generateCreateMethod());
         klass.addMethod(this.protocolTemplateCodeGen.generateCreateWithContextMethod());
         return klass;

package/dist/command-helpers/abi.js

@@ -149,7 +149,7 @@ const getEtherscanLikeAPIUrl = (network) => {
         case 'fantom-testnet':
             return `https://api-testnet.ftmscan.com/api`;
         case 'zksync-era':
-            return `https://explorer.zksync.io/api`;
+            return `https://block-explorer-api.mainnet.zksync.io/api`;
         case 'polygon-zkevm-testnet':
             return `https://testnet-zkevm.polygonscan.com/api`;
         case 'polygon-zkevm':

package/dist/commands/add.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const errors_1 = require("@oclif/core/lib/errors");
 const gluegun_1 = require("gluegun");
+const immutable_1 = __importDefault(require("immutable"));
 const abi_1 = require("../command-helpers/abi");
 const DataSourcesExtractor = __importStar(require("../command-helpers/data-sources"));
 const network_1 = require("../command-helpers/network");
@@ -43,8 +44,8 @@ class AddCommand extends core_1.Command {
         const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifestPath);
         const protocol = protocols_1.default.fromDataSources(dataSourcesAndTemplates);
         const manifest = await subgraph_1.default.load(manifestPath, { protocol });
-        const network = manifest.result.dataSources?.[0].network;
-        const result = manifest.result;
+        const network = manifest.result.getIn(['dataSources', 0, 'network']);
+        const result = manifest.result.asMutable();
         let startBlock = startBlockFlag;
         const entities = getEntities(manifest);
         const contractNames = getContractNames(manifest);
@@ -86,22 +87,23 @@ class AddCommand extends core_1.Command {
         await (0, scaffold_1.writeABI)(ethabi, contractName);
         const { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities);
         ethabi.data = abiData;
-        await (0, scaffold_1.writeSchema)(ethabi, protocol, result.schema.file, collisionEntities, contractName);
+        await (0, scaffold_1.writeSchema)(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities, contractName);
         await (0, scaffold_1.writeMapping)(ethabi, protocol, contractName, collisionEntities);
         await (0, scaffold_1.writeTestsFiles)(ethabi, protocol, contractName);
-        const dataSources = result.dataSources;
+        const dataSources = result.get('dataSources');
         const dataSource = await (0, scaffold_1.generateDataSource)(protocol, contractName, network, address, ethabi, startBlock);
         // Handle the collisions edge case by copying another data source yaml data
         if (mergeEntities && onlyCollisions) {
-            const firstDataSource = dataSources?.[0];
+            const firstDataSource = dataSources.get(0);
             const source = dataSource.get('source');
-            const mapping = firstDataSource.mapping;
+            const mapping = firstDataSource.get('mapping').asMutable();
             // Save the address of the new data source
-            source.abi = firstDataSource.source.abi;
+            source.abi = firstDataSource.get('source').get('abi');
             dataSource.set('mapping', mapping);
             dataSource.set('source', source);
         }
-        await subgraph_1.default.write({ ...result, dataSources: [...dataSources, dataSource] }, manifestPath);
+        result.set('dataSources', dataSources.push(dataSource));
+        await subgraph_1.default.write(result, manifestPath);
         // Update networks.json
         if (gluegun_1.filesystem.exists(networksFile)) {
             await (0, network_1.updateNetworksFile)(network, contractName, address, networksFile);
@@ -153,17 +155,17 @@ AddCommand.flags = {
 };
 exports.default = AddCommand;
 const getEntities = (manifest) => {
-    const dataSources = manifest.result?.dataSources || [];
-    const templates = manifest.result?.templates || [];
-    return [
-        ...dataSources.map(source => source.mapping.entities),
-        ...templates.map(template => template.mapping.entities),
-    ].flat();
+    const dataSources = manifest.result.get('dataSources', immutable_1.default.List());
+    const templates = manifest.result.get('templates', immutable_1.default.List());
+    return dataSources
+        .concat(templates)
+        .map((dataSource) => dataSource.getIn(['mapping', 'entities']))
+        .flatten();
 };
 const getContractNames = (manifest) => {
-    const dataSources = manifest.result?.dataSources || [];
-    const templates = manifest.result?.templates || [];
-    return [...dataSources.map(source => source.name), templates.map(template => template.name)];
+    const dataSources = manifest.result.get('dataSources', immutable_1.default.List());
+    const templates = manifest.result.get('templates', immutable_1.default.List());
+    return dataSources.concat(templates).map((dataSource) => dataSource.get('name'));
 };
 const updateEventNamesOnCollision = (ethabi, entities, contractName, mergeEntities) => {
     let abiData = ethabi.data;

package/dist/subgraph.d.ts

@@ -1,105 +1,25 @@
+import immutable from 'immutable';
 import { Subgraph as ISubgraph } from './protocols/subgraph';
-import { ManifestZodSchema } from './manifest';
 type ResolveFile = (path: string) => string;
 export default class Subgraph {
     static validate(data: any, protocol: any, { resolveFile }: {
         resolveFile: ResolveFile;
     }): Promise<any>;
-    static validateSchema(manifest: ManifestZodSchema, { resolveFile }: {
+    static validateSchema(manifest: any, { resolveFile }: {
         resolveFile: ResolveFile;
     }): void;
-    static validateRepository(manifest: ManifestZodSchema): {
-        path: string[];
-        message: string;
-    }[];
-    static validateDescription(manifest: ManifestZodSchema): {
-        path: string[];
-        message: string;
-    }[];
-    static validateHandlers(manifest: ManifestZodSchema, protocol: any, protocolSubgraph: ISubgraph): any;
-    static validateContractValues(manifest: ManifestZodSchema, protocol: any): any;
-    static validateUniqueDataSourceNames(manifest: ManifestZodSchema): any;
-    static validateUniqueTemplateNames(manifest: ManifestZodSchema): any;
-    static dump(manifest: ManifestZodSchema): string;
+    static validateRepository(manifest: immutable.Collection<any, any>): immutable.List<unknown>;
+    static validateDescription(manifest: immutable.Collection<any, any>): immutable.List<unknown>;
+    static validateHandlers(manifest: immutable.Collection<any, any>, protocol: any, protocolSubgraph: ISubgraph): any;
+    static validateContractValues(manifest: any, protocol: any): any;
+    static validateUniqueDataSourceNames(manifest: any): any;
+    static validateUniqueTemplateNames(manifest: any): any;
+    static dump(manifest: any): string;
     static load(filename: string, { protocol, skipValidation }?: {
         protocol?: any;
         skipValidation?: boolean;
     }): Promise<{
-        result: {
-            specVersion: string;
-            schema: {
-                file: string;
-            };
-            dataSources: {
-                kind: string;
-                name: string;
-                network: string;
-                source: {
-                    address: string;
-                    abi: string;
-                    startBlock?: number | bigint | undefined;
-                };
-                mapping: {
-                    file: string;
-                    kind: "ethereum/events";
-                    apiVersion: string;
-                    language: "wasm/assemblyscript";
-                    entities: string[];
-                    eventHandlers?: {
-                        event: string;
-                        handler: string;
-                        topic0?: string | undefined;
-                    }[] | undefined;
-                    callHandlers?: {
-                        function: string;
-                        handler: string;
-                    }[] | undefined;
-                    blockHandlers?: {
-                        handler: string;
-                        filter?: {
-                            kind: "call";
-                        } | undefined;
-                    }[] | undefined;
-                };
-            }[];
-            description?: string | undefined;
-            repository?: string | undefined;
-            graft?: {
-                base: string;
-                block: bigint;
-            } | undefined;
-            templates?: {
-                kind: string;
-                name: string;
-                network: string;
-                source: {
-                    abi: string;
-                    startBlock?: number | bigint | undefined;
-                };
-                mapping: {
-                    file: string;
-                    kind: "ethereum/events";
-                    apiVersion: string;
-                    language: "wasm/assemblyscript";
-                    entities: string[];
-                    eventHandlers?: {
-                        event: string;
-                        handler: string;
-                        topic0?: string | undefined;
-                    }[] | undefined;
-                    callHandlers?: {
-                        function: string;
-                        handler: string;
-                    }[] | undefined;
-                    blockHandlers?: {
-                        handler: string;
-                        filter?: {
-                            kind: "call";
-                        } | undefined;
-                    }[] | undefined;
-                };
-            }[] | undefined;
-        };
+        result: immutable.Map<any, any>;
         warning: string | null;
     }>;
     static write(manifest: any, filename: string): Promise<void>;

package/dist/subgraph.js

@@ -34,19 +34,18 @@ const yaml_1 = __importDefault(require("yaml"));
 const types_1 = require("yaml/types");
 const debug_1 = __importDefault(require("./debug"));
 const validation = __importStar(require("./validation"));
-const manifest_1 = require("./manifest");
 const subgraphDebug = (0, debug_1.default)('graph-cli:subgraph');
 const throwCombinedError = (filename, errors) => {
     throw new Error(errors.reduce((msg, e) => `${msg}
 
-  Path: ${e.path.length === 0 ? '/' : e.path.join(' > ')}
-  ${e.message.split('\n').join('\n  ')}`, `Error in ${path_1.default.relative(process.cwd(), filename)}:`));
+  Path: ${e.get('path').size === 0 ? '/' : e.get('path').join(' > ')}
+  ${e.get('message').split('\n').join('\n  ')}`, `Error in ${path_1.default.relative(process.cwd(), filename)}:`));
 };
-const buildCombinedWarning = (filename, warnings) => warnings.length > 0
+const buildCombinedWarning = (filename, warnings) => warnings.size > 0
     ? warnings.reduce((msg, w) => `${msg}
 
-    Path: ${w.path.length === 0 ? '/' : w.path.join(' > ')}
-    ${w.message.split('\n').join('\n    ')}`, `Warnings in ${path_1.default.relative(process.cwd(), filename)}:`) + '\n'
+    Path: ${w.get('path').size === 0 ? '/' : w.get('path').join(' > ')}
+    ${w.get('message').split('\n').join('\n    ')}`, `Warnings in ${path_1.default.relative(process.cwd(), filename)}:`) + '\n'
     : null;
 class Subgraph {
     static async validate(data, protocol, { resolveFile }) {
@@ -67,12 +66,10 @@ class Subgraph {
             return definition.name.value === 'SubgraphManifest';
         });
         // Validate the subgraph manifest using this schema
-        return validation.validateManifest(data, rootType, schema, protocol, {
-            resolveFile,
-        });
+        return validation.validateManifest(data, rootType, schema, protocol, { resolveFile });
     }
     static validateSchema(manifest, { resolveFile }) {
-        const filename = resolveFile(manifest.schema.file);
+        const filename = resolveFile(manifest.getIn(['schema', 'file']));
         const validationErrors = validation.validateSchema(filename);
         let errors;
         if (validationErrors.size > 0) {
@@ -97,106 +94,103 @@ class Subgraph {
         }
     }
     static validateRepository(manifest) {
-        const repository = manifest.repository;
-        // repository is optional, so no need to throw error if it's not set
-        if (!repository)
-            return [];
+        const repository = manifest.get('repository');
         return /^https:\/\/github\.com\/graphprotocol\/graph-tooling?$/.test(repository) ||
             // For legacy reasons, we should error on example subgraphs
             /^https:\/\/github\.com\/graphprotocol\/example-subgraphs?$/.test(repository)
-            ? [
-                {
-                    path: ['repository'],
-                    message: `\
+            ? immutable_1.default.List().push(immutable_1.default.fromJS({
+                path: ['repository'],
+                message: `\
 The repository is still set to ${repository}.
 Please replace it with a link to your subgraph source code.`,
-                },
-            ]
-            : [];
+            }))
+            : immutable_1.default.List();
     }
     static validateDescription(manifest) {
         // TODO: Maybe implement this in the future for each protocol example description
-        return (manifest?.description || '').startsWith('Gravatar for ')
-            ? [
-                {
-                    path: ['description'],
-                    message: `\
+        return manifest.get('description', '').startsWith('Gravatar for ')
+            ? immutable_1.default.List().push(immutable_1.default.fromJS({
+                path: ['description'],
+                message: `\
 The description is still the one from the example subgraph.
 Please update it to tell users more about your subgraph.`,
-                },
-            ]
-            : [];
+            }))
+            : immutable_1.default.List();
     }
     static validateHandlers(manifest, protocol, protocolSubgraph) {
-        return manifest.dataSources
-            .filter(dataSource => protocol.isValidKindName(dataSource.kind))
+        return manifest
+            .get('dataSources')
+            .filter((dataSource) => protocol.isValidKindName(dataSource.get('kind')))
             .reduce((errors, dataSource, dataSourceIndex) => {
             const path = ['dataSources', dataSourceIndex, 'mapping'];
-            const mapping = dataSource.mapping;
+            const mapping = dataSource.get('mapping');
             const handlerTypes = protocolSubgraph.handlerTypes();
-            subgraphDebug('Validating dataSource "%s" handlers with %d handlers types defined for protocol', dataSource.name, handlerTypes.size);
+            subgraphDebug('Validating dataSource "%s" handlers with %d handlers types defined for protocol', dataSource.get('name'), handlerTypes.size);
             if (handlerTypes.size == 0) {
                 return errors;
             }
             const areAllHandlersEmpty = handlerTypes
-                // @ts-expect-error TODO: handlerTypes needs to be improved
-                .map(handlerType => mapping?.[handlerType] || [])
-                .every(handlers => handlers.length === 0);
+                .map((handlerType) => mapping.get(handlerType, immutable_1.default.List()))
+                .every((handlers) => handlers.isEmpty());
             const handlerNamesWithoutLast = handlerTypes.pop().join(', ');
             return areAllHandlersEmpty
-                ? errors.push({
+                ? errors.push(immutable_1.default.fromJS({
                     path,
                     message: `\
 Mapping has no ${handlerNamesWithoutLast} or ${handlerTypes.get(-1)}.
 At least one such handler must be defined.`,
-                })
+                }))
                 : errors;
-        }, []);
+        }, immutable_1.default.List());
     }
     static validateContractValues(manifest, protocol) {
         if (!protocol.hasContract()) {
-            return [];
+            return immutable_1.default.List();
         }
         return validation.validateContractValues(manifest, protocol);
     }
     // Validate that data source names are unique, so they don't overwrite each other.
     static validateUniqueDataSourceNames(manifest) {
         const names = [];
-        return manifest.dataSources.reduce((errors, dataSource, dataSourceIndex) => {
+        return manifest
+            .get('dataSources')
+            .reduce((errors, dataSource, dataSourceIndex) => {
             const path = ['dataSources', dataSourceIndex, 'name'];
-            const name = dataSource.name;
+            const name = dataSource.get('name');
             if (names.includes(name)) {
-                errors = errors.push({
+                errors = errors.push(immutable_1.default.fromJS({
                     path,
                     message: `\
 More than one data source named '${name}', data source names must be unique.`,
-                });
+                }));
             }
             names.push(name);
             return errors;
-        }, []);
+        }, immutable_1.default.List());
     }
     static validateUniqueTemplateNames(manifest) {
         const names = [];
-        return (manifest?.templates || []).reduce((errors, template, templateIndex) => {
+        return manifest
+            .get('templates', immutable_1.default.List())
+            .reduce((errors, template, templateIndex) => {
             const path = ['templates', templateIndex, 'name'];
-            const name = template.name;
+            const name = template.get('name');
             if (names.includes(name)) {
-                errors = errors.push({
+                errors = errors.push(immutable_1.default.fromJS({
                     path,
                     message: `\
 More than one template named '${name}', template names must be unique.`,
-                });
+                }));
             }
             names.push(name);
             return errors;
-        }, []);
+        }, immutable_1.default.List());
     }
     static dump(manifest) {
         types_1.strOptions.fold.lineWidth = 90;
         // @ts-expect-error TODO: plain is the value behind the TS constant
         types_1.strOptions.defaultType = 'PLAIN';
-        return yaml_1.default.stringify(manifest);
+        return yaml_1.default.stringify(manifest.toJS());
     }
     static async load(filename, { protocol, skipValidation } = {
         skipValidation: false,
@@ -216,18 +210,12 @@ More than one template named '${name}', template names must be unique.`,
         const resolveFile = maybeRelativeFile => path_1.default.resolve(path_1.default.dirname(filename), maybeRelativeFile);
         // TODO: Validation for file data sources
         if (!has_file_data_sources) {
-            const manifestErrors = await Subgraph.validate(data, protocol, {
-                resolveFile,
-            });
+            const manifestErrors = await Subgraph.validate(data, protocol, { resolveFile });
             if (manifestErrors.size > 0) {
                 throwCombinedError(filename, manifestErrors);
             }
         }
-        const manifestSchema = manifest_1.Manifest.safeParse(data);
-        if (!manifestSchema.success) {
-            throw new Error(manifestSchema.error.message);
-        }
-        const manifest = manifestSchema.data;
+        const manifest = immutable_1.default.fromJS(data);
         // Validate the schema
         Subgraph.validateSchema(manifest, { resolveFile });
         // Perform other validations
@@ -236,24 +224,18 @@ More than one template named '${name}', template names must be unique.`,
             resolveFile,
         });
         const errors = skipValidation
-            ? []
-            : [
-                ...protocolSubgraph.validateManifest(),
-                ...Subgraph.validateContractValues(manifest, protocol),
-                ...Subgraph.validateUniqueDataSourceNames(manifest),
-                ...Subgraph.validateUniqueTemplateNames(manifest),
-                ...Subgraph.validateHandlers(manifest, protocol, protocolSubgraph),
-            ];
-        if (errors.length > 0) {
+            ? immutable_1.default.List()
+            : immutable_1.default.List.of(...protocolSubgraph.validateManifest(), ...Subgraph.validateContractValues(manifest, protocol), ...Subgraph.validateUniqueDataSourceNames(manifest), ...Subgraph.validateUniqueTemplateNames(manifest), ...Subgraph.validateHandlers(manifest, protocol, protocolSubgraph));
+        if (errors.size > 0) {
             throwCombinedError(filename, errors);
         }
         // Perform warning validations
         const warnings = skipValidation
-            ? []
-            : [...Subgraph.validateRepository(manifest), ...Subgraph.validateDescription(manifest)];
+            ? immutable_1.default.List()
+            : immutable_1.default.List.of(...Subgraph.validateRepository(manifest), ...Subgraph.validateDescription(manifest));
         return {
             result: manifest,
-            warning: warnings.length > 0 ? buildCombinedWarning(filename, warnings) : null,
+            warning: warnings.size > 0 ? buildCombinedWarning(filename, warnings) : null,
         };
     }
     static async write(manifest, filename) {

package/dist/validation/contract.d.ts

@@ -1,6 +1,6 @@
+import immutable from 'immutable';
 import Protocol from '../protocols';
 import { ContractCtor } from '../protocols/contract';
-import { ManifestZodSchema } from '../manifest';
 export declare const validateContract: (value: string, ProtocolContract: ContractCtor) => {
     valid: false;
     error: string;
@@ -8,4 +8,4 @@ export declare const validateContract: (value: string, ProtocolContract: Contrac
     valid: true;
     error: string | null;
 };
-export declare const validateContractValues: (manifest: ManifestZodSchema, protocol: Protocol) => any;
+export declare const validateContractValues: (manifest: immutable.Map<any, any>, protocol: Protocol) => any;

package/dist/validation/contract.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateContractValues = exports.validateContract = void 0;
+const immutable_1 = __importDefault(require("immutable"));
 const validateContract = (value, ProtocolContract) => {
     const contract = new ProtocolContract(value);
     const { valid, error } = contract.validate();
@@ -16,26 +20,25 @@ exports.validateContract = validateContract;
 const validateContractValues = (manifest, protocol) => {
     const ProtocolContract = protocol.getContract();
     const fieldName = ProtocolContract.identifierName();
-    return manifest.dataSources
-        .filter(datasource => protocol.isValidKindName(datasource.kind))
+    return manifest
+        .get('dataSources')
+        .filter((dataSource) => protocol.isValidKindName(dataSource.get('kind')))
         .reduce((errors, dataSource, dataSourceIndex) => {
         const path = ['dataSources', dataSourceIndex, 'source', fieldName];
         // No need to validate if the source has no contract field
-        // @ts-expect-error TODO: we need to rework the classes to make this `fieldName` not be a string
-        if (!dataSource.source[fieldName]) {
+        if (!dataSource.get('source').has(fieldName)) {
             return errors;
         }
-        // @ts-expect-error TODO: we need to rework the classes to make this `fieldName` not be a string
-        const contractValue = dataSource.source[fieldName];
+        const contractValue = dataSource.getIn(['source', fieldName]);
         const { valid, error } = (0, exports.validateContract)(contractValue, ProtocolContract);
         // Validate whether the contract is valid for the protocol
         if (valid) {
             return errors;
         }
-        return errors.push({
+        return errors.push(immutable_1.default.fromJS({
             path,
             message: error,
-        });
-    }, []);
+        }));
+    }, immutable_1.default.List());
 };
 exports.validateContractValues = validateContractValues;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.54.0-alpha-20230724180700-d5ce4e2",
+  "version": "0.54.0-alpha-20230801202859-9fcb823",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.54.0-alpha-20230724180700-d5ce4e2",
+  "version": "0.54.0-alpha-20230801202859-9fcb823",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -44,15 +44,13 @@
     "tmp-promise": "3.0.3",
     "web3-eth-abi": "1.7.0",
     "which": "2.0.2",
-    "yaml": "1.10.2",
-    "zod": "^3.21.4"
+    "yaml": "1.10.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.0.0",
     "@types/js-yaml": "^3.12.7",
-    "@types/node": "^20.3.2",
     "@types/semver": "^7.3.13",
     "@types/which": "^2.0.1",
     "copyfiles": "^2.4.1",
@@ -61,8 +59,7 @@
     "spawn-command": "0.0.2-1",
     "strip-ansi": "6.0.1",
     "tern": "0.24.3",
-    "typescript": "^5.0.0",
-    "zod-to-json-schema": "^3.21.3"
+    "typescript": "^5.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -78,7 +75,7 @@
     ]
   },
   "scripts": {
-    "build": "tsc -b tsconfig.build.json && oclif manifest && oclif readme && copyfiles -u 1 src/**/*.graphql dist/ && node scripts/generate-json-schema.mjs",
+    "build": "tsc -b tsconfig.build.json && oclif manifest && oclif readme && copyfiles -u 1 src/**/*.graphql dist/",
     "oclif:pack": "npm pack && pnpm oclif pack tarballs --no-xz && node scripts/rename-tarballs.mjs",
     "test": "jest --verbose",
     "test:add": "jest tests/cli/add.test.ts --verbose",

package/dist/manifest.d.ts

@@ -1,511 +0,0 @@
-import { z } from 'zod';
-export declare const Manifest: z.ZodObject<{
-    specVersion: z.ZodString;
-    schema: z.ZodObject<{
-        file: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        file: string;
-    }, {
-        file: string;
-    }>;
-    description: z.ZodOptional<z.ZodString>;
-    repository: z.ZodOptional<z.ZodString>;
-    graft: z.ZodOptional<z.ZodObject<{
-        base: z.ZodString;
-        block: z.ZodBigInt;
-    }, "strip", z.ZodTypeAny, {
-        base: string;
-        block: bigint;
-    }, {
-        base: string;
-        block: bigint;
-    }>>;
-    dataSources: z.ZodArray<z.ZodObject<{
-        kind: z.ZodString;
-        name: z.ZodString;
-        network: z.ZodString;
-        source: z.ZodObject<{
-            address: z.ZodString;
-            abi: z.ZodString;
-            startBlock: z.ZodOptional<z.ZodUnion<[z.ZodBigInt, z.ZodNumber]>>;
-        }, "strip", z.ZodTypeAny, {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        }, {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        }>;
-        mapping: z.ZodObject<{
-            kind: z.ZodLiteral<"ethereum/events">;
-            apiVersion: z.ZodString;
-            language: z.ZodLiteral<"wasm/assemblyscript">;
-            entities: z.ZodArray<z.ZodString, "many">;
-            eventHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                event: z.ZodString;
-                handler: z.ZodString;
-                topic0: z.ZodOptional<z.ZodString>;
-            }, "strip", z.ZodTypeAny, {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }, {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }>, "many">>;
-            callHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                function: z.ZodString;
-                handler: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                function: string;
-                handler: string;
-            }, {
-                function: string;
-                handler: string;
-            }>, "many">>;
-            blockHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                handler: z.ZodString;
-                filter: z.ZodOptional<z.ZodObject<{
-                    kind: z.ZodLiteral<"call">;
-                }, "strip", z.ZodTypeAny, {
-                    kind: "call";
-                }, {
-                    kind: "call";
-                }>>;
-            }, "strip", z.ZodTypeAny, {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }, {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }>, "many">>;
-            file: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        }, {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }, {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }>, "many">;
-    templates: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        kind: z.ZodString;
-        name: z.ZodString;
-        network: z.ZodString;
-        source: z.ZodObject<{
-            abi: z.ZodString;
-            startBlock: z.ZodOptional<z.ZodUnion<[z.ZodBigInt, z.ZodNumber]>>;
-        }, "strip", z.ZodTypeAny, {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        }, {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        }>;
-        mapping: z.ZodObject<{
-            kind: z.ZodLiteral<"ethereum/events">;
-            apiVersion: z.ZodString;
-            language: z.ZodLiteral<"wasm/assemblyscript">;
-            entities: z.ZodArray<z.ZodString, "many">;
-            eventHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                event: z.ZodString;
-                handler: z.ZodString;
-                topic0: z.ZodOptional<z.ZodString>;
-            }, "strip", z.ZodTypeAny, {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }, {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }>, "many">>;
-            callHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                function: z.ZodString;
-                handler: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                function: string;
-                handler: string;
-            }, {
-                function: string;
-                handler: string;
-            }>, "many">>;
-            blockHandlers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-                handler: z.ZodString;
-                filter: z.ZodOptional<z.ZodObject<{
-                    kind: z.ZodLiteral<"call">;
-                }, "strip", z.ZodTypeAny, {
-                    kind: "call";
-                }, {
-                    kind: "call";
-                }>>;
-            }, "strip", z.ZodTypeAny, {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }, {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }>, "many">>;
-            file: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        }, {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }, {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }>, "many">>;
-}, "strip", z.ZodTypeAny, {
-    specVersion: string;
-    schema: {
-        file: string;
-    };
-    dataSources: {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }[];
-    description?: string | undefined;
-    repository?: string | undefined;
-    graft?: {
-        base: string;
-        block: bigint;
-    } | undefined;
-    templates?: {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }[] | undefined;
-}, {
-    specVersion: string;
-    schema: {
-        file: string;
-    };
-    dataSources: {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            address: string;
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }[];
-    description?: string | undefined;
-    repository?: string | undefined;
-    graft?: {
-        base: string;
-        block: bigint;
-    } | undefined;
-    templates?: {
-        kind: string;
-        name: string;
-        network: string;
-        source: {
-            abi: string;
-            startBlock?: number | bigint | undefined;
-        };
-        mapping: {
-            file: string;
-            kind: "ethereum/events";
-            apiVersion: string;
-            language: "wasm/assemblyscript";
-            entities: string[];
-            eventHandlers?: {
-                event: string;
-                handler: string;
-                topic0?: string | undefined;
-            }[] | undefined;
-            callHandlers?: {
-                function: string;
-                handler: string;
-            }[] | undefined;
-            blockHandlers?: {
-                handler: string;
-                filter?: {
-                    kind: "call";
-                } | undefined;
-            }[] | undefined;
-        };
-    }[] | undefined;
-}>;
-export type ManifestZodSchema = z.infer<typeof Manifest>;

package/dist/manifest.js

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Manifest = void 0;
-const zod_1 = require("zod");
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#14-schema
-const Schema = zod_1.z.object({
-    file: zod_1.z.string().describe('The path of the GraphQL IDL file, either local or on IPFS.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#151-ethereumcontractsource
-const EthereumContractSource = zod_1.z.object({
-    address: zod_1.z.string(),
-    abi: zod_1.z.string(),
-    startBlock: zod_1.z.union([zod_1.z.bigint(), zod_1.z.number()]).optional(),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#151-ethereumcontractsource
-const EthereumTemplateContractSource = zod_1.z.object({
-    abi: zod_1.z.string(),
-    startBlock: zod_1.z.union([zod_1.z.bigint(), zod_1.z.number()]).optional(),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#1522-eventhandler
-const EventHandler = zod_1.z.object({
-    event: zod_1.z
-        .string()
-        .describe('An identifier for an event that will be handled in the mapping script. For Ethereum contracts, this must be the full event signature to distinguish from events that may share the same name. No alias types can be used.'),
-    handler: zod_1.z
-        .string()
-        .describe('The name of an exported function in the mapping script that should handle the specified event.'),
-    topic0: zod_1.z
-        .string()
-        .optional()
-        .describe('A 0x prefixed hex string. If provided, events whose topic0 is equal to this value will be processed by the given handler. When topic0 is provided, only the topic0 value will be matched, and not the hash of the event signature. This is useful for processing anonymous events in Solidity, which can have their topic0 set to anything. By default, topic0 is equal to the hash of the event signature.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#1523-callhandler
-const CallHandler = zod_1.z.object({
-    function: zod_1.z
-        .string()
-        .describe('An identifier for a function that will be handled in the mapping script. For Ethereum contracts, this is the normalized function signature to filter calls by.'),
-    handler: zod_1.z
-        .string()
-        .describe('The name of an exported function in the mapping script that should handle the specified event.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#15241-blockhandlerfilter
-const BlockHandlerFilter = zod_1.z.object({
-    kind: zod_1.z.literal('call').describe('The selected block handler filter.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#1524-blockhandler
-const BlockHandler = zod_1.z.object({
-    handler: zod_1.z
-        .string()
-        .describe('The name of an exported function in the mapping script that should handle the specified event.'),
-    filter: BlockHandlerFilter.optional().describe('Definition of the filter to apply. If none is supplied, the handler will be called on every block.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#1521-ethereum-mapping
-const EthereumMapping = zod_1.z.object({
-    kind: zod_1.z
-        .literal('ethereum/events')
-        .describe('Must be "ethereum/events" for Ethereum Events Mapping.'),
-    apiVersion: zod_1.z
-        .string()
-        .describe('Semver string of the version of the Mappings API that will be used by the mapping script.'),
-    language: zod_1.z
-        .literal('wasm/assemblyscript')
-        .describe('The language of the runtime for the Mapping API.'),
-    entities: zod_1.z
-        .array(zod_1.z.string())
-        .describe('A list of entities that will be ingested as part of this mapping. Must correspond to names of entities in the GraphQL IDL.'),
-    eventHandlers: zod_1.z
-        .array(EventHandler)
-        .optional()
-        .describe('Handlers for specific events, which will be defined in the mapping script.'),
-    callHandlers: zod_1.z
-        .array(CallHandler)
-        .optional()
-        .describe('A list of functions that will trigger a handler and the name of the corresponding handlers in the mapping.'),
-    blockHandlers: zod_1.z
-        .array(BlockHandler)
-        .optional()
-        .describe('Defines block filters and handlers to process matching blocks.'),
-    file: zod_1.z.string().describe('The path of the mapping script.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#152-mapping
-const Mapping = EthereumMapping;
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#15-data-source
-const DataSource = zod_1.z.object({
-    kind: zod_1.z.string().describe('The type of data source. Possible values: ethereum/contract.'),
-    name: zod_1.z
-        .string()
-        .describe('The name of the source data. Will be used to generate APIs in the mapping and also for self-documentation purposes.'),
-    network: zod_1.z
-        .string()
-        .describe('For blockchains, this describes which network the subgraph targets'),
-    source: EthereumContractSource.describe('The source data on a blockchain such as Ethereum.'),
-    mapping: Mapping.describe('The mapping that defines how to ingest the data.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#17-data-source-templates
-const TemplateSource = zod_1.z.object({
-    kind: zod_1.z.string().describe('The type of data source. Possible values: ethereum/contract.'),
-    name: zod_1.z
-        .string()
-        .describe('The name of the source data. Will be used to generate APIs in the mapping and also for self-documentation purposes.'),
-    network: zod_1.z
-        .string()
-        .describe('For blockchains, this describes which network the subgraph targets'),
-    source: EthereumTemplateContractSource.describe('The source data on a blockchain such as Ethereum.'),
-    mapping: Mapping.describe('The mapping that defines how to ingest the data.'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#18-graft-base
-const GraftBase = zod_1.z.object({
-    base: zod_1.z.string().describe('The subgraph ID of the base subgraph'),
-    block: zod_1.z.bigint().describe('The block number up to which to use data from the base subgraph'),
-});
-// https://github.com/graphprotocol/graph-node/blob/master/docs/subgraph-manifest.md#13-top-level-api
-exports.Manifest = zod_1.z.object({
-    specVersion: zod_1.z
-        .string()
-        .describe('A Semver version indicating which version of this API is being used.'),
-    schema: Schema.describe('The GraphQL schema of this subgraph.'),
-    description: zod_1.z.string().describe("An optional description of the subgraph's purpose.").optional(),
-    repository: zod_1.z.string().describe('An optional link to where the subgraph lives.').optional(),
-    graft: GraftBase.describe('An optional base to graft onto.').optional(),
-    dataSources: zod_1.z
-        .array(DataSource)
-        .describe("Each data source spec defines the data that will be ingested as well as the transformation logic to derive the state of the subgraph's entities based on the source data."),
-    templates: zod_1.z
-        .array(TemplateSource)
-        .optional()
-        .describe('Each data source template defines a data source that can be created dynamically from the mappings.'),
-});