Fixes #1909, added test suite for new LIGO plugin, based on LIGO v1.

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "0.40.22",
+  "version": "0.40.23",
   "packages": [
     "taqueria-protocol",
     "taqueria-lib*",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/root",
-	"version": "0.40.22",
+	"version": "0.40.23",
 	"description": "An easy to use opinionated tool for building, testing, and deploying Tezos software",
 	"main": "index.ts",
 	"directories": {

taqueria-analytics/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/analytics",
-	"version": "0.40.22",
+	"version": "0.40.23",
 	"description": "A TypeScript SDK submitting events for Taqueria activity",
 	"main": "./index.js",
 	"source": "./index.ts",
@@ -35,7 +35,7 @@
 	},
 	"homepage": "https://github.com/pinnacle-labs/taqueria#readme",
 	"dependencies": {
-		"@taqueria/protocol": "^0.40.22",
+		"@taqueria/protocol": "^0.40.23",
 		"node-machine-id-xz": "^1.0.2"
 	},
 	"devDependencies": {

taqueria-lib-ligo/common.ts

@@ -39,6 +39,14 @@ export const formatLigoError = (err: Error): Error => {
 	) {
 		result =
 			`By convention, Taqueria expects you to import your contract with Contract as the module name.\nFor instance, if you have a contract in a file called "increment.mligo", in your parameter/storage list file you must include #import "Increment.mligo" "Contract" for compilation to be successful.`;
+	} else {
+		const regex = /contracts\/(.+): No such file or directory/;
+		const match = regex.exec(result);
+		if (match) {
+			const filename = match[1];
+			result =
+				`The file ${filename} was not found. Please ensure that the file exists and that it is in the contracts directory.`;
+		}
 	}
 
 	err.message = result

taqueria-lib-ligo/compile.ts

@@ -222,6 +222,7 @@ export const inject = (commonObj: Common) => {
 				[],
 			);
 		} catch (err) {
+			const formattedErr = err instanceof Error ? formatLigoError(err) : err;
 			emitExternalError(err, sourceFile);
 			return [];
 		}
@@ -455,7 +456,7 @@ export const compile = async (commonObj: Common, parsedArgs: Opts): Promise<void
 				{
 					source: sourceFile,
 					artifact:
-						`No contract modules found in "${sourceFile}\nIf your contract is defined within a namespace, please ensure that it is exported from the contract file."`,
+						`No contract modules found in "${sourceFile}".\nIf your contract is defined within a namespace, please ensure that it is exported from the contract file."`,
 				},
 			]);
 		}

taqueria-lib-ligo/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/lib-ligo",
-	"version": "0.40.22",
+	"version": "0.40.23",
 	"description": "A taqueria library which provides common functionality for the LIGO and LIGO Legacy Plugins",
 	"targets": {
 		"default": {
@@ -41,7 +41,7 @@
 	},
 	"homepage": "https://github.com/pinnacle-labs/taqueria#readme",
 	"dependencies": {
-		"@taqueria/node-sdk": "^0.40.22",
+		"@taqueria/node-sdk": "^0.40.23",
 		"fast-glob": "^3.3.1"
 	},
 	"devDependencies": {

taqueria-plugin-archetype/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@taqueria/plugin-archetype",
-	"version": "0.40.22",
+	"version": "0.40.23",
 	"description": "A taqueria plugin for compiling Archetype smart contracts",
 	"targets": {
 		"default": {
@@ -40,7 +40,7 @@
 	},
 	"homepage": "https://github.com/pinnacle-labs/taqueria#readme",
 	"dependencies": {
-		"@taqueria/node-sdk": "^0.40.22",
+		"@taqueria/node-sdk": "^0.40.23",
 		"fast-glob": "^3.3.1",
 		"ts-pattern": "^5.0.5"
 	},