@taqueria/plugin-ligo 0.0.1-test.33 → 0.0.2

package/compile.js

@@ -1,7 +1,8 @@
-const {exec} = require('child_process')
+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`)
@@ -11,10 +12,10 @@ const getInputFilename = (opts) => sourceFile => {
     return join(opts.config.contractsDir, sourceFile)
 }
 
-const getCompileCommand = (opts) => (sourceFile) => {
+const getCompileCommand = (opts, arch) => (sourceFile) => {
     const {projectDir} = opts
     const inputFile = getInputFilename (opts) (sourceFile)
-    const baseCommand = `docker run --rm -v \"${projectDir}\":/project -w /project ligolang/ligo:next compile contract ${inputFile}`
+    const baseCommand = `docker run --platform ${arch} --rm -v \"${projectDir}\":/project -w /project ligolang/ligo:next compile contract ${inputFile}`
     const entryPoint = opts.e ? `-e ${opts.e}` : ""
     const syntax = opts["-s"] ? `s ${opts['s']} : ""` : ""
     const outFile = `-o ${getContractArtifactFilename(opts)(sourceFile)}`
@@ -22,28 +23,10 @@ const getCompileCommand = (opts) => (sourceFile) => {
     return cmd
 }
 
-const execCmd = cmd => new Promise((resolve, reject) => {
-    exec(cmd, (err, stdout, stderr) => {
-        if (err) reject({
-            status: 'failed',
-            stdout: "",
-            stderr: err
-        })
-        else if (stderr) reject({
-            status: 'failed',
-            stdout,
-            stderr
-        })
-        else resolve({
-            status: 'success',
-            stdout,
-            stderr
-        })
-    })
-})
-
 const compileContract = (opts) => (sourceFile) =>
-    execCmd(getCompileCommand(opts) (sourceFile))
+    getArch()
+    .then(arch => getCompileCommand(opts, arch) (sourceFile))
+    .then(execCmd)
     .then(() => ({contract: sourceFile, artifact: getContractArtifactFilename(opts) (sourceFile)}))
 
 const compileAll = parsedArgs => {

package/index.js

@@ -4,7 +4,7 @@ const compile = require('./compile')
 Plugin.create(i18n => ({
     schema: "1.0",
     version: "0.1",
-    name: "taqueria-plugin-ligo",
+    alias: "ligo",
     tasks: [
         Task.create({
             task: "compile",

package/package.json

@@ -1,20 +1,14 @@
 {
   "name": "@taqueria/plugin-ligo",
-  "version": "0.0.1-test.33",
+  "version": "0.0.2",
   "description": "A taqueria plugin for compiling LIGO smart contracts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "echo 'Nothing to build.'",
+    "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",
-    "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",
@@ -41,6 +35,6 @@
   "homepage": "https://github.com/ecadlabs/taqueria#readme",
   "dependencies": {
     "fast-glob": "^3.2.7",
-    "@taqueria/node-sdk": "file:../taqueria-sdk"
+    "@taqueria/node-sdk": "^0.0.1"
   }
 }