@graphprotocol/graph-cli 0.92.0 → 0.93.0

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @graphprotocol/graph-cli
 
+## 0.93.0
+
+### Minor Changes
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - Update all dependencies
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - - add networks registry support
+  - improve `graph init` flow
+    - filter through the networks as you type
+    - more information about the networks
+    - remove unnecessary options depending on the selection
+    - ESC key to go back
+  - allow specifying ipfs/url for substreams package
+
+### Patch Changes
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - dependencies updates:
+
+  - Updated dependency
+    [`assemblyscript@0.19.23` ↗︎](https://www.npmjs.com/package/assemblyscript/v/0.19.23) (from
+    `0.27.31`, in `dependencies`)
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - Fix `graph add` flag parameters
+  parsing
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix bug with clashing \_id field name
+  in schema
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix generated example entity id
+  uniqueness
+
+- [#1849](https://github.com/graphprotocol/graph-tooling/pull/1849)
+  [`00e0a83`](https://github.com/graphprotocol/graph-tooling/commit/00e0a830165a946749d12fdbcdc0ad00074a2ecd)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - rollback asc version
+
 ## 0.92.0
 
 ### Minor Changes

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

@@ -14,5 +14,5 @@ interface CreateCompilerOptions {
  * Appends /api/v0 to the end of a The Graph IPFS URL
  */
 export declare function appendApiVersionForGraph(inputString: string): string;
-export declare function createCompiler(manifest: string, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }: CreateCompilerOptions): Promise<Compiler | null>;
+export declare function createCompiler(manifest: string, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }: CreateCompilerOptions): Compiler | null;
 export {};

package/dist/command-helpers/compiler.js

@@ -19,7 +19,7 @@ export function appendApiVersionForGraph(inputString) {
     return inputString;
 }
 // Helper function to construct a subgraph compiler
-export async function createCompiler(manifest, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }) {
+export function createCompiler(manifest, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }) {
     // Validate the IPFS URL (if a node address was provided)
     try {
         if (ipfs && typeof ipfs === 'string')

package/dist/commands/build.js

@@ -66,7 +66,7 @@ export default class BuildCommand extends Command {
             const identifierName = protocol.getContract().identifierName();
             await updateSubgraphNetwork(manifest, network, networkFile, identifierName);
         }
-        const compiler = await createCompiler(manifest, {
+        const compiler = createCompiler(manifest, {
             ipfs,
             outputDir,
             outputFormat,

package/dist/commands/deploy.js

@@ -227,7 +227,7 @@ export default class DeployCommand extends Command {
             const identifierName = protocol.getContract().identifierName();
             await updateSubgraphNetwork(manifest, network, networkFile, identifierName);
         }
-        const compiler = await createCompiler(manifest, {
+        const compiler = createCompiler(manifest, {
             ipfs,
             headers,
             outputDir,

package/dist/commands/publish.js

@@ -104,7 +104,7 @@ export default class PublishCommand extends Command {
         catch (e) {
             this.error(e, { exit: 1 });
         }
-        const compiler = await createCompiler(manifest, {
+        const compiler = createCompiler(manifest, {
             ipfs,
             outputDir: 'build/',
             outputFormat: 'wasm',

package/dist/compiler/asc.d.ts

@@ -1,3 +1,4 @@
+export declare const ready: () => Promise<void>;
 export interface CompileOptions {
     inputFile: string;
     global: string;
@@ -5,4 +6,4 @@ export interface CompileOptions {
     libs: string;
     outputFile: string;
 }
-export declare const compile: ({ inputFile, global, baseDir, libs, outputFile }: CompileOptions) => Promise<void>;
+export declare const compile: ({ inputFile, global, baseDir, libs, outputFile }: CompileOptions) => void;

package/dist/compiler/asc.js

@@ -1,4 +1,4 @@
-import asc from 'assemblyscript/asc';
+import * as asc from 'assemblyscript/cli/asc';
 const createExitHandler = (inputFile) => () => {
     throw new Error(`The AssemblyScript compiler crashed when compiling this file: '${inputFile}'
 Suggestion: try to comment the whole file and uncomment it little by little while re-running the graph-cli until you isolate the line where the problem happens.
@@ -8,19 +8,33 @@ Also, please contact us so we can make the CLI better by handling errors like th
 };
 const setupExitHandler = (exitHandler) => process.addListener('exit', exitHandler);
 const removeExitHandler = (exitHandler) => process.removeListener('exit', exitHandler);
-const assemblyScriptCompiler = async (argv, options) => await asc.main(argv, options);
+// Important note, the `asc.main` callback function parameter is synchronous,
+// that's why this function doesn't need to be `async` and the throw works properly.
+const assemblyScriptCompiler = (argv, options) => asc.main(argv, options, err => {
+    if (err) {
+        throw err;
+    }
+    return 0;
+});
 const compilerDefaults = {
     stdout: process.stdout,
     stderr: process.stdout,
 };
+// You MUST call this function once before compiling anything.
+// Internally it just delegates to the AssemblyScript compiler
+// which just delegates to the binaryen lib.
+export const ready = async () => {
+    await asc.ready;
+};
 // For now this function doesn't check if `asc` is ready, because
 // it requires an asynchronous wait. Whenever you call this function,
 // it doesn't matter how many times, just make sure you call `ready`
 // once before everything..
-export const compile = async ({ inputFile, global, baseDir, libs, outputFile }) => {
+export const compile = ({ inputFile, global, baseDir, libs, outputFile }) => {
     const exitHandler = createExitHandler(inputFile);
     setupExitHandler(exitHandler);
     const compilerArgs = [
+        '--explicitStart',
         '--exportRuntime',
         '--runtime',
         'stub',
@@ -35,7 +49,7 @@ export const compile = async ({ inputFile, global, baseDir, libs, outputFile })
         '--optimize',
         '--debug',
     ];
-    await assemblyScriptCompiler(compilerArgs, compilerDefaults);
+    assemblyScriptCompiler(compilerArgs, compilerDefaults);
     // only if compiler succeeded, that is, when the line above doesn't throw
     removeExitHandler(exitHandler);
 };

package/dist/compiler/index.d.ts

@@ -55,8 +55,8 @@ export default class Compiler {
         pathToWasm: string;
         dataSource: immutable.Map<any, any>;
     }): any[];
-    _compileDataSourceMapping(protocol: Protocol, dataSource: immutable.Map<any, any>, mappingPath: string, compiledFiles: Map<any, any>, spinner: Spinner, validate?: boolean): Promise<any>;
-    _compileTemplateMapping(template: immutable.Collection<any, any>, mappingPath: string, compiledFiles: Map<any, any>, spinner: Spinner): Promise<any>;
+    _compileDataSourceMapping(protocol: Protocol, dataSource: immutable.Map<any, any>, mappingPath: string, compiledFiles: Map<any, any>, spinner: Spinner, validate?: boolean): any;
+    _compileTemplateMapping(template: immutable.Collection<any, any>, mappingPath: string, compiledFiles: Map<any, any>, spinner: Spinner): any;
     _validateMappingContent(filePath: string): void;
     writeSubgraphToOutputDirectory(protocol: Protocol, subgraph: immutable.Map<any, any>): Promise<any>;
     uploadSubgraphToIPFS(subgraph: immutable.Map<any, any>): Promise<any>;

package/dist/compiler/index.js

@@ -180,24 +180,11 @@ export default class Compiler {
         return await withSpinner(`Compile subgraph`, `Failed to compile subgraph`, `Warnings while compiling subgraph`, async (spinner) => {
             // Cache compiled files so identical input files are only compiled once
             const compiledFiles = new Map();
-            // Handle data sources
-            const dataSources = subgraph.get('dataSources');
-            const compiledDataSources = await Promise.all(dataSources.map(async (dataSource) => {
-                const mappingPath = dataSource.getIn(['mapping', 'file']);
-                const compiledPath = await this._compileDataSourceMapping(this.protocol, dataSource, mappingPath, compiledFiles, spinner, validate);
-                return dataSource.setIn(['mapping', 'file'], compiledPath);
-            }));
-            subgraph = subgraph.set('dataSources', compiledDataSources);
-            // Handle templates if they exist
-            const templates = subgraph.get('templates');
-            if (templates !== undefined) {
-                const compiledTemplates = await Promise.all(templates.map(async (template) => {
-                    const mappingPath = template.getIn(['mapping', 'file']);
-                    const compiledPath = await this._compileTemplateMapping(template, mappingPath, compiledFiles, spinner);
-                    return template.setIn(['mapping', 'file'], compiledPath);
-                }));
-                subgraph = subgraph.set('templates', compiledTemplates);
-            }
+            await asc.ready();
+            subgraph = subgraph.update('dataSources', (dataSources) => dataSources.map((dataSource) => dataSource.updateIn(['mapping', 'file'], (mappingPath) => this._compileDataSourceMapping(this.protocol, dataSource, mappingPath, compiledFiles, spinner, validate))));
+            subgraph = subgraph.update('templates', (templates) => templates === undefined
+                ? templates
+                : templates.map((template) => template.updateIn(['mapping', 'file'], (mappingPath) => this._compileTemplateMapping(template, mappingPath, compiledFiles, spinner))));
             return subgraph;
         });
     }
@@ -240,7 +227,7 @@ export default class Compiler {
         const missingHandlers = handlerNamesFromDataSources.filter((handler) => !handlerNamesFromWasm.has(handler));
         return missingHandlers;
     }
-    async _compileDataSourceMapping(protocol, dataSource, mappingPath, compiledFiles, spinner, validate = false) {
+    _compileDataSourceMapping(protocol, dataSource, mappingPath, compiledFiles, spinner, validate = false) {
         if (protocol.name == 'substreams') {
             return;
         }
@@ -269,7 +256,7 @@ export default class Compiler {
                 throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
             }
             const global = path.relative(baseDir, this.globalsFile);
-            await asc.compile({
+            asc.compile({
                 inputFile,
                 global,
                 baseDir,
@@ -293,7 +280,7 @@ export default class Compiler {
             throw Error(`Failed to compile data source mapping: ${e.message}`);
         }
     }
-    async _compileTemplateMapping(template, mappingPath, compiledFiles, spinner) {
+    _compileTemplateMapping(template, mappingPath, compiledFiles, spinner) {
         try {
             const templateName = template.get('name');
             const baseDir = this.sourceDir;
@@ -319,7 +306,7 @@ export default class Compiler {
                 throw Error('Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest.');
             }
             const global = path.relative(baseDir, this.globalsFile);
-            await asc.compile({
+            asc.compile({
                 inputFile,
                 global,
                 baseDir,

package/oclif.manifest.json

@@ -1016,5 +1016,5 @@
       ]
     }
   },
-  "version": "0.92.0"
+  "version": "0.93.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.92.0",
+  "version": "0.93.0",
   "type": "module",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
@@ -28,7 +28,7 @@
     "@oclif/plugin-warn-if-update-available": "^3.1.24",
     "@pinax/graph-networks-registry": "^0.6.5",
     "@whatwg-node/fetch": "^0.10.1",
-    "assemblyscript": "0.27.31",
+    "assemblyscript": "0.19.23",
     "binary-install": "^1.1.0",
     "chokidar": "4.0.1",
     "debug": "4.3.7",