Fixes #1939, simulation task execution not displaying result or error…

… message
TezosTaqueria · Oct 29, 2024 · 06e72a1 · 06e72a1
1 parent 16956d3
commit 06e72a1
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 32 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "0.62.0",
+  "version": "0.62.1",
   "packages": [
     "taqueria-protocol",
     "taqueria-lib*",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/root",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "An easy to use opinionated tool for building, testing, and deploying Tezos software",
 	"main": "index.ts",
 	"directories": {

diff --git a/taqueria-analytics/package.json b/taqueria-analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/analytics",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A TypeScript SDK submitting events for Taqueria activity",
 	"main": "./index.js",
 	"source": "./index.ts",

diff --git a/taqueria-lib-ligo/compile-all.ts b/taqueria-lib-ligo/compile-all.ts
@@ -28,7 +28,7 @@ const compileAll = async (commonObj: Common, parsedArgs: Opts): Promise<void> =>
 	return Promise.all(compilePromises)
 		.then(tables => tables.flat())
 		.then(sendJsonRes)
-		.catch(err => sendErr(err, false));
+		.catch(err => sendErr(err, false) as void);
 };
 
 export default compileAll;
diff --git a/taqueria-lib-ligo/package.json b/taqueria-lib-ligo/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/lib-ligo",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria library which provides common functionality for the LIGO and LIGO Legacy Plugins",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-archetype/package.json b/taqueria-plugin-archetype/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-archetype",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for compiling Archetype smart contracts",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-contract-types/package.json b/taqueria-plugin-contract-types/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-contract-types",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"main": "index.cjs",
 	"module": "index.js",
 	"source": "index.ts",

diff --git a/taqueria-plugin-core/package.json b/taqueria-plugin-core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-core",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for core tasks",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-flextesa/package.json b/taqueria-plugin-flextesa/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-flextesa",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A plugin for Taqueria providing local sandbox capabilities built on Flextesa",
 	"keywords": [
 		"taqueria",

diff --git a/taqueria-plugin-helloworld/package.json b/taqueria-plugin-helloworld/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-helloworld",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "An example of a plugin for Taqueria",
 	"main": "index.js",
 	"scripts": {

diff --git a/taqueria-plugin-ipfs-pinata/package.json b/taqueria-plugin-ipfs-pinata/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-ipfs-pinata",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A plugin for Taqueria providing ipfs publishing and pinning using the Pinata service",
 	"keywords": [
 		"taqueria",

diff --git a/taqueria-plugin-jest/package.json b/taqueria-plugin-jest/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-jest",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"main": "index.cjs",
 	"module": "index.js",
 	"source": "index.ts",

diff --git a/taqueria-plugin-ligo-legacy/package.json b/taqueria-plugin-ligo-legacy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-ligo-legacy",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for compiling LIGO smart contracts that target LIGO v0.73.0 and earlier.",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-ligo/package.json b/taqueria-plugin-ligo/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-ligo",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for compiling LIGO smart contracts",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-metadata/package.json b/taqueria-plugin-metadata/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-metadata",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A plugin for Taqueria providing metadata creation and validation.",
 	"keywords": [
 		"taqueria",

diff --git a/taqueria-plugin-mock/package.json b/taqueria-plugin-mock/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-mock",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A plugin used to test Taqueria",
 	"private": true,
 	"scripts": {

diff --git a/taqueria-plugin-octez-client/common.ts b/taqueria-plugin-octez-client/common.ts
@@ -48,7 +48,7 @@ export const getCheckFileExistenceCommand = async (parsedArgs: UnionOpts, source
 	if (!projectDir) throw `No project directory provided`;
 	const arch = getArchSync();
 	const baseCmd =
-		`docker run --rm -v \"${projectDir}\":/project -w /project --platform ${arch} ${getClientDockerImage()} ls`;
+		`docker run --rm -v \"${projectDir}\":/project -w /project --platform ${arch} --entrypoint /bin/ls ${getClientDockerImage()}`;
 	const inputFile = getInputFilename(parsedArgs, sourceFile);
 	const cmd = `${baseCmd} ${inputFile}`;
 	return cmd;

diff --git a/taqueria-plugin-octez-client/package.json b/taqueria-plugin-octez-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-octez-client",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for utilizing octez-client",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-octez-client/simulate.ts b/taqueria-plugin-octez-client/simulate.ts
@@ -4,6 +4,7 @@ import {
 	getArch,
 	getContractContent,
 	getParameter,
+	joinPaths,
 	sendAsyncErr,
 	sendErr,
 	sendJsonRes,
@@ -71,6 +72,11 @@ const getSimulateCmd = async (parsedArgs: Opts, sourceFile: string): Promise<str
 const simulateContract = (parsedArgs: Opts, sourceFile: string): Promise<TableRow> =>
 	getCheckFileExistenceCommand(parsedArgs, sourceFile)
 		.then(execCmd)
+		.catch(_ =>
+			Promise.reject(
+				new Error(`${joinPaths(parsedArgs.config.artifactsDir ?? 'artifacts', sourceFile)} does not exist`),
+			)
+		)
 		.then(() =>
 			retrySimulateCmd(parsedArgs, sourceFile, 0)
 				.then(({ stdout, stderr }) => {

diff --git a/taqueria-plugin-smartpy-legacy/package.json b/taqueria-plugin-smartpy-legacy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-smartpy-legacy",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for compiling SmartPy smart contracts using SmartPy v0.16 (legacy syntax).",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-smartpy/package.json b/taqueria-plugin-smartpy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-smartpy",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin used to test and compile smart contracts written in SmartPy.",
 	"main": "index.js",
 	"targets": {

diff --git a/taqueria-plugin-taquito/package.json b/taqueria-plugin-taquito/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-taquito",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A taqueria plugin for originating smart contracts using Taquito",
 	"targets": {
 		"default": {

diff --git a/taqueria-plugin-tezbox/package.json b/taqueria-plugin-tezbox/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-tezbox",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A plugin for Taqueria providing local sandbox capabilities built on TezBox",
 	"keywords": [
 		"taqueria",

diff --git a/taqueria-plugin-tzcompose/package.json b/taqueria-plugin-tzcompose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-tzcompose",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A TzCompose plugin for Taqueria using the GoTz SDK",
 	"main": "index.js",
 	"scripts": {

diff --git a/taqueria-protocol/package.json b/taqueria-protocol/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/protocol",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A TypeScript package which contains types that are to be shared between @taqueria/node-sdk and @taqueria/taqueria.",
 	"main": "index.js",
 	"scripts": {

diff --git a/taqueria-sdk/index.ts b/taqueria-sdk/index.ts
@@ -253,13 +253,15 @@ export const sendAsyncRes = (msg: string, newline = true): Promise<void> => Prom
 export const sendErr = (msg: string, newline = true) => {
 	if (!msg || msg.length === 0) return;
 	const output = newline ? msg + '\n' : msg;
-	return process.stderr.write(output) as unknown as void;
+	process.stderr.write(output);
+	return output;
 };
 
 export const sendWarn = (msg: string, newline = true) => {
 	if (!msg || msg.length === 0) return;
 	const output = newline ? msg + '\n' : msg;
-	return process.stderr.write(output) as unknown as void;
+	process.stderr.write(output);
+	return output;
 };
 
 export const sendAsyncErr = (msg: string, newline = true) => Promise.reject(sendErr(msg, newline)); // should this be Promise.reject?
@@ -773,7 +775,7 @@ export const getContracts = (regex: RegExp, config: Protocol.LoadedConfig.t) =>
 	);
 };
 
-const joinPaths = (...paths: string[]): string => paths.join('/');
+export const joinPaths = (...paths: string[]): string => paths.join('/');
 export const stringToSHA256 = (s: string) => SHA256.toSHA256(s);
 
 const getPackageName = () => {

diff --git a/taqueria-sdk/package.json b/taqueria-sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/node-sdk",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A TypeScript SDK for NodeJS used for Taqueria plugin development.",
 	"main": "./index.js",
 	"source": "./index.ts",

diff --git a/taqueria-toolkit/package.json b/taqueria-toolkit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/toolkit",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"description": "A TypeScript library for NodeJS to work with Taqueria projects",
 	"source": "./index.ts",
 	"main": "./index.js",

diff --git a/taqueria-vscode-extension-web-ui/package.json b/taqueria-vscode-extension-web-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "taqueria-vscode-extension-web-ui",
 	"private": true,
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

diff --git a/taqueria-vscode-extension/package.json b/taqueria-vscode-extension/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Taqueria",
 	"description": "A better way to build on Tezos",
 	"publisher": "TezosTaqueria",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"private": true,
 	"engines": {
 		"vscode": "^1.84.2"

diff --git a/tests/package.json b/tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/tests",
-	"version": "0.62.0",
+	"version": "0.62.1",
 	"type": "module",
 	"private": true,
 	"description": "This is Taqueria testing project includes unit, integration and e2e tests",