@taqueria/plugin-ligo 0.0.1 → 0.0.4

package/compile.js

@@ -2,7 +2,6 @@ const {execCmd, getArch} = require('@taqueria/node-sdk')
 const {extname, basename, join} = require('path')
 const glob = require('fast-glob')
 
-
 const getContractArtifactFilename = (opts) => (sourceFile) => {
     const outFile = basename(sourceFile, extname(sourceFile))
     return join(opts.config.artifactsDir, `${outFile}.tz`)
@@ -23,11 +22,21 @@ const getCompileCommand = (opts, arch) => (sourceFile) => {
     return cmd
 }
 
+const getLigoCompilationError = (stderr) => {
+    const err = stderr.split("\n").slice(1).join("\n")
+    return `There was a compilation error.\n\n${err}`
+}
+
 const compileContract = (opts) => (sourceFile) =>
     getArch()
     .then(arch => getCompileCommand(opts, arch) (sourceFile))
     .then(execCmd)
-    .then(() => ({contract: sourceFile, artifact: getContractArtifactFilename(opts) (sourceFile)}))
+    .then(result => result.status === 'success'
+        ? ({contract: sourceFile, artifact: getContractArtifactFilename(opts) (sourceFile)})
+        : Promise.reject({
+            errCode: "E_COMPILE", context: result, errMsg: getLigoCompilationError(result.stderr)}
+        )
+    )
 
 const compileAll = parsedArgs => {
     // TODO: Fetch list of files from SDK
@@ -36,20 +45,30 @@ const compileAll = parsedArgs => {
         {cwd: parsedArgs.contractsDir, absolute: false}
     )
     .then(entries => entries.map(compileContract(parsedArgs)))
+    .then(processes => processes.length > 0
+        ? processes
+        : [{contract: "None found", artifact: "N/A"}]
+    )
     .then(promises => Promise.all(promises))
 }
 
 const compile = parsedArgs => {
     const p = parsedArgs.sourceFile
         ? compileContract(parsedArgs) (parsedArgs.sourceFile)
+            .then(result => [result])
         : compileAll(parsedArgs)
     
-    return p.then(results => ({
+    return p
+    .then(results => ({
         status: 'success',
         stdout: results,
         stderr: "",
         render: 'table'
     }))
+    .catch(err => err.errCode
+        ? Promise.resolve({status: 'failed', stdout: '', stderr: err.errMsg, previous: err})
+        : Promise.resolve({status: 'failed', stderr: err.getMessage(), stdout: '', previous: err})
+    )
 }
 
 module.exports = compile

package/package.json

@@ -1,24 +1,14 @@
 {
   "name": "@taqueria/plugin-ligo",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "A taqueria plugin for compiling LIGO smart contracts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "echo 'Nothing to build.' && exit 0",
-    "build-ci": "npm run build",
     "pluginInfo": "node index.js --taqRun pluginInfo --i18n '{\"foo\":\"bar\"}' --config '{\"contractsDir\":\"contracts\",\"testsDir\": \"tests\",\"artifactsDir\": \"artifacts\"}' --projectDir ../test-project --configDir ./.taq",
     "compile": "node index.js --taqRun proxy --task compile --i18n '{\"foo\":\"bar\"}' --config '{\"contractsDir\":\"contracts\",\"testsDir\": \"tests\",\"artifactsDir\": \"artifacts\"}' --projectDir ../test-project --configDir ./.taq",
-    "debugPluginInfo": "node --inspect index.js --taqRun pluginInfo --i18n '{\"foo\":\"bar\"}' --config '{\"contractsDir\":\"contracts\",\"testsDir\": \"tests\"}' --projectDir ../test-project --configDir ./.taq",
-    "get-sdk-version": "cd ../taqueria-sdk && node -e 'console.log(require(\"./package.json\").version)'",
-    "backup-config": "cp package.json package.json.orig && cp package-lock.json package-lock.json.orig",
-    "restore-config": "mv package.json.orig package.json && mv package-lock.json.orig package-lock.json",
-    "update-sdk-version": "sed -i -e \"s/file:\\.\\.\\/taqueria-sdk/`npm run get-sdk-version | tail -1`/\" package.json",
-    "update-sdk-version-lock": "sed -i -e \"s/file:\\.\\.\\/taqueria-sdk/`npm run get-sdk-version | tail -1`/\" package-lock.json",
-    "prod-config": "npm run backup-config && npm run update-sdk-version && npm run update-sdk-version-lock",
-    "prod-config-ci": "npm run prod-config",
-    "build-prod": "npm run backup-config && npm run prod-config && npm run build && npm run restore-config"
+    "debugPluginInfo": "node --inspect index.js --taqRun pluginInfo --i18n '{\"foo\":\"bar\"}' --config '{\"contractsDir\":\"contracts\",\"testsDir\": \"tests\"}' --projectDir ../test-project --configDir ./.taq"
   },
-
   "keywords": [
     "taqueria",
     "tezos",
@@ -33,19 +23,17 @@
   ],
   "author": "ECAD Labs",
   "license": "Apache-2.0",
-
   "repository": {
     "type": "git",
     "url": "https://github.com/ecadlabs/taqueria.git",
     "directory": "taqueria-plugin-ligo"
   },
-
   "bugs": {
     "url": "https://github.com/ecadlabs/taqueria/issues"
   },
   "homepage": "https://github.com/ecadlabs/taqueria#readme",
   "dependencies": {
     "fast-glob": "^3.2.7",
-    "@taqueria/node-sdk": "0.0.1"
+    "@taqueria/node-sdk": "^0.0.4"
   }
 }