everything building

dOrgJelli · dOrgJelli · commit b6b2d5501bcf · 2020-08-04T02:32:17.000-05:00
diff --git a/examples/simple-storage/protocol/package.json b/examples/simple-storage/protocol/package.json
@@ -1,9 +1,14 @@
 {
   "name": "@web3api/examples-simple-storage",
+  "version": "0.0.1-alpha.1",
+  "license": "MIT",
   "scripts": {
+    "codegen": "yarn subgraph:codegen",
+    "build": "w3 build && yarn contracts:build",
+    "test:env:up": "w3 test-env up && yarn contracts:deploy",
+    "test:env:down": "w3 test-env down",
     "contracts:build": "",
-    "subgraph:codegen": "cd subgraph && graph codegen --out-dir generated/",
-    "subgraph:build": "cd subgraph && graph build"
+    "subgraph:codegen": "cd src/subgraph && graph codegen --out-dir generated/"
   },
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.18.0",
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "root",
+  "license": "MIT",
   "private": true,
   "workspaces": {
     "packages": [
@@ -8,7 +9,10 @@
     ]
   },
   "scripts": {
-    "test:ci:client-js": "yarn workspace @web3api/client-js test:ci"
+    "build": "yarn build:wasm-ts && yarn build:cli && yarn build:client-js",
+    "build:cli": "yarn workspace @web3api/cli build",
+    "build:client-js": "yarn workspace @web3api/client-js build",
+    "build:wasm-ts": "yarn workspace @web3api/wasm-ts build"
   },
   "devDependencies": {
     "lerna": "3.22.1"
diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@web3api/cli",
   "version": "0.0.1-alpha.1",
+  "license": "MIT",
   "bin": {
     "w3": "bin/w3"
   },
diff --git a/packages/cli/src/commands/test-env.ts b/packages/cli/src/commands/test-env.ts
@@ -36,17 +36,18 @@ export default {
         "Starting test environment...",
         "Failed to start test environment",
         "Warning starting test environment",
-        async apinner => {
-          return startupTestEnv();
+        async spinner => {
+          // TODO: support verbose logging
+          return startupTestEnv(true);
         }
       )
     } else if (command === "down") {
       return await withSpinner(
         "Shutting down test environment...",
         "Failed to shutdown test environment",
         "Warning shutting down test environment",
-        async apinner => {
-          return await shutdownTestEnv();
+        async spinner => {
+          return await shutdownTestEnv(true);
         }
       )
     } else {
diff --git a/packages/cli/src/lib/env/test.ts b/packages/cli/src/lib/env/test.ts
@@ -1,9 +1,9 @@
 const testEnv = require("@web3api/client-test-env");
 
-export async function startupTestEnv() {
-  await testEnv.up();
+export async function startupTestEnv(quiet: boolean) {
+  await testEnv.up(quiet);
 }
 
-export async function shutdownTestEnv() {
-  await testEnv.down();
+export async function shutdownTestEnv(quiet: boolean) {
+  await testEnv.down(quiet);
 }
diff --git a/packages/client-js/package.json b/packages/client-js/package.json
@@ -1,7 +1,9 @@
 {
   "name": "@web3api/client-js",
   "version": "0.0.1-alpha.1",
+  "license": "MIT",
   "scripts": {
+    "build": "rm -rf build && tsc",
     "test": "jest --passWithNoTests --verbose",
     "test:watch": "jest --watch --passWithNoTests --verbose",
     "test:ci": "yarn test:env:up && yarn test && yarn test:env:down",
@@ -26,6 +28,7 @@
     "@types/js-yaml": "3.11.1",
     "@web3api/client-test-env": "0.0.1-alpha.1",
     "jest": "26.2.2",
-    "ts-jest": "26.1.4"
+    "ts-jest": "26.1.4",
+    "typescript": "3.9.7"
   }
 }
diff --git a/packages/client-js/src/Web3API.ts b/packages/client-js/src/Web3API.ts
@@ -223,7 +223,7 @@ export class Web3API {
         );
 
         const result = await WASMLoader.instantiate(
-          wasm,
+          wasm as any,
           getHostImports(() => result as ASCModule, portals)
         ) as any;
 
diff --git a/packages/client-js/tsconfig.json b/packages/client-js/tsconfig.json
@@ -1,17 +1,31 @@
 {
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist",
-    "target": "es2015",
-    "module": "commonjs",
-    "composite": true,
+    "outDir": "build",
+    "esModuleInterop": true,
+    "lib": [
+      "es2015",
+      "es5",
+      "dom"
+    ],
+    "moduleResolution": "node",
     "declaration": true,
+    "preserveSymlinks": true,
+    "preserveWatchOutput": true,
+    "pretty": false,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "module": "commonjs",
     "sourceMap": true,
-    "esModuleInterop": true,
-    "strict": true,
-    "lib": ["es2015", "es6", "esnext.asynciterable", "dom"]
+    "target": "es5"
   },
-  "include": ["src/**/*.ts"],
-  "exclude": ["src/**/__tests__/**/*.ts"],
-  "references": []
+  "include": [
+    "./src/**/*"
+  ],
+  "exclude": [
+    "./src/**/__tests__"
+  ]
 }
diff --git a/packages/client-test-env/index.js b/packages/client-test-env/index.js
@@ -1,6 +1,6 @@
 const { exec } = require('child_process');
 
-async function runCommand(command) {
+async function runCommand(command, quiet) {
 
   if (!quiet) {
     console.log(`> ${command}`)
@@ -26,11 +26,11 @@ async function runCommand(command) {
   })
 }
 
-async function up(quite = false) {
+async function up(quiet = false) {
   await runCommand('docker-compose up -d', quiet)
 }
 
-async function down(quite = false) {
+async function down(quiet = false) {
   await runCommand('docker-compose down', quiet)
 }
 
diff --git a/packages/client-test-env/package.json b/packages/client-test-env/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@web3api/client-test-env",
   "version": "0.0.1-alpha.1",
+  "license": "MIT",
   "main": "index.js",
   "scripts": {
     "up": "docker-compose up",
diff --git a/packages/wasm-ts/assembly/index.ts b/packages/wasm-ts/assembly/index.ts
@@ -24,14 +24,6 @@ export {
   Bytes
 } from "./lib/core/Bytes";
 
-export {
-  JSON,
-  JSONDecoder,
-  JSONEncoder,
-  JSONHandler,
-  ThrowingJSONHandler
-} from "./lib/core/JSON";
-
 ///////////////////////////
 /// ASM Runtime Helpers ///
 ///////////////////////////
diff --git a/packages/wasm-ts/assembly/lib/core/JSON.ts b/packages/wasm-ts/assembly/lib/core/JSON.ts
diff --git a/packages/wasm-ts/package.json b/packages/wasm-ts/package.json
@@ -1,8 +1,10 @@
 {
   "name": "@web3api/wasm-ts",
   "version": "0.0.1-alpha.1",
+  "license": "MIT",
   "main": "./assembly/index.ts",
   "scripts": {
+    "build": "asc ./assembly/index.ts --outFile ./build/index.wasm -d ./build/index.d.ts",
     "test": "asp --verbose",
     "test:ci": "asp --summary"
   },
diff --git a/yarn.lock b/yarn.lock
@@ -10099,7 +10099,7 @@ typeforce@^1.11.3, typeforce@^1.11.5:
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
 
-typescript@^3.9.6:
+typescript@3.9.7, typescript@^3.9.6:
   version "3.9.7"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web3api/cli",`
`3`	`3`	`"version": "0.0.1-alpha.1",`
	`4`	`+ "license": "MIT",`
`4`	`5`	`"bin": {`
`5`	`6`	`"w3": "bin/w3"`
`6`	`7`	`},`
Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,18 @@ export default {`
`36`	`36`	`"Starting test environment...",`
`37`	`37`	`"Failed to start test environment",`
`38`	`38`	`"Warning starting test environment",`
`39`		`- async apinner => {`
`40`		`- return startupTestEnv();`
	`39`	`+ async spinner => {`
	`40`	`+ // TODO: support verbose logging`
	`41`	`+ return startupTestEnv(true);`
`41`	`42`	`}`
`42`	`43`	`)`
`43`	`44`	`} else if (command === "down") {`
`44`	`45`	`return await withSpinner(`
`45`	`46`	`"Shutting down test environment...",`
`46`	`47`	`"Failed to shutdown test environment",`
`47`	`48`	`"Warning shutting down test environment",`
`48`		`- async apinner => {`
`49`		`- return await shutdownTestEnv();`
	`49`	`+ async spinner => {`
	`50`	`+ return await shutdownTestEnv(true);`
`50`	`51`	`}`
`51`	`52`	`)`
`52`	`53`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`const testEnv = require("@web3api/client-test-env");`
`2`	`2`
`3`		`-export async function startupTestEnv() {`
`4`		`- await testEnv.up();`
	`3`	`+export async function startupTestEnv(quiet: boolean) {`
	`4`	`+ await testEnv.up(quiet);`
`5`	`5`	`}`
`6`	`6`
`7`		`-export async function shutdownTestEnv() {`
`8`		`- await testEnv.down();`
	`7`	`+export async function shutdownTestEnv(quiet: boolean) {`
	`8`	`+ await testEnv.down(quiet);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web3api/client-js",`
`3`	`3`	`"version": "0.0.1-alpha.1",`
	`4`	`+ "license": "MIT",`
`4`	`5`	`"scripts": {`
	`6`	`+ "build": "rm -rf build && tsc",`
`5`	`7`	`"test": "jest --passWithNoTests --verbose",`
`6`	`8`	`"test:watch": "jest --watch --passWithNoTests --verbose",`
`7`	`9`	`"test:ci": "yarn test:env:up && yarn test && yarn test:env:down",`
`@@ -26,6 +28,7 @@`
`26`	`28`	`"@types/js-yaml": "3.11.1",`
`27`	`29`	`"@web3api/client-test-env": "0.0.1-alpha.1",`
`28`	`30`	`"jest": "26.2.2",`
`29`		`- "ts-jest": "26.1.4"`
	`31`	`+ "ts-jest": "26.1.4",`
	`32`	`+ "typescript": "3.9.7"`
`30`	`33`	`}`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`const { exec } = require('child_process');`
`2`	`2`
`3`		`-async function runCommand(command) {`
	`3`	`+async function runCommand(command, quiet) {`
`4`	`4`
`5`	`5`	`if (!quiet) {`
`6`	`6`	console.log(`> ${command}`)
`@@ -26,11 +26,11 @@ async function runCommand(command) {`
`26`	`26`	`})`
`27`	`27`	`}`
`28`	`28`
`29`		`-async function up(quite = false) {`
	`29`	`+async function up(quiet = false) {`
`30`	`30`	`await runCommand('docker-compose up -d', quiet)`
`31`	`31`	`}`
`32`	`32`
`33`		`-async function down(quite = false) {`
	`33`	`+async function down(quiet = false) {`
`34`	`34`	`await runCommand('docker-compose down', quiet)`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web3api/client-test-env",`
`3`	`3`	`"version": "0.0.1-alpha.1",`
	`4`	`+ "license": "MIT",`
`4`	`5`	`"main": "index.js",`
`5`	`6`	`"scripts": {`
`6`	`7`	`"up": "docker-compose up",`