Fix file-not-found error when signing with the chel command

HISTORY.md

@@ -1,5 +1,10 @@
 # HISTORY
 
+### v2.1.1
+
+- Change the way signinig key files are read (from `import` to `readFile`) so
+  that the compiled `chel` command works.
+
 ### v2.1.0
 
 - Implemented signing (`chel manifest`, `chel keygen`) and verified (`chel verifySignature`) contracts. (h/t [@corrideat](https://github.com/okTurtles/chel/pull/27))

build/main.js

@@ -251,7 +251,7 @@ async function readRemoteData(src, key) {
 async function revokeNet() {
   await Deno.permissions.revoke({ name: "net" });
 }
-var backends, multibase, multicodes, multihasher, importJsonFile;
+var backends, multibase, multicodes, multihasher, readJsonFile;
 var init_utils = __esm({
   "src/utils.ts"() {
     "use strict";
@@ -262,9 +262,9 @@ var init_utils = __esm({
     multibase = base58btc;
     multicodes = { JSON: 512, RAW: 0 };
     multihasher = default3.blake2b.blake2b256;
-    importJsonFile = async (file) => {
-      const data = await import(path.toFileUrl(path.resolve(String(file))).toString(), { with: { type: "json" } });
-      return data.default;
+    readJsonFile = async (file) => {
+      const contents = await Deno.readTextFile(path.resolve(String(file)));
+      return JSON.parse(contents);
     };
   }
 });
@@ -764,7 +764,6 @@ init_utils();
 async function manifest(args) {
   await revokeNet();
   const parsedArgs = flags.parse(args, { collect: ["key"], alias: { "key": "k" } });
-  console.log(parsedArgs);
   const [keyFile, contractFile] = parsedArgs._;
   const parsedFilepath = path.parse(contractFile);
   const { name: contractName, base: contractBasename, dir: contractDir } = parsedFilepath;
@@ -773,10 +772,10 @@ async function manifest(args) {
   const outFilepath = path.join(contractDir, `${contractName}.${version2}.manifest.json`);
   if (!keyFile)
     exit("Missing signing key file");
-  const signingKeyDescriptor = await importJsonFile(keyFile);
+  const signingKeyDescriptor = await readJsonFile(keyFile);
   const signingKey = deserializeKey(signingKeyDescriptor.privkey);
   const publicKeys = Array.from(new Set([serializeKey(signingKey, false)].concat(...await Promise.all(parsedArgs.key?.map(async (kf) => {
-    const descriptor = await importJsonFile(kf);
+    const descriptor = await readJsonFile(kf);
     const key = deserializeKey(descriptor.pubkey);
     if (key.type !== EDWARDS25519SHA512BATCH) {
       exit(`Invalid key type ${key.type}; only ${EDWARDS25519SHA512BATCH} keys are supported.`);
@@ -871,8 +870,8 @@ var verifySignature2 = async (args, internal = false) => {
   const [manifestFile] = parsedArgs._;
   const keyFile = parsedArgs.k;
   const [externalKeyDescriptor, manifest2] = await Promise.all([
-    keyFile ? importJsonFile(keyFile) : null,
-    importJsonFile(manifestFile)
+    keyFile ? readJsonFile(keyFile) : null,
+    readJsonFile(manifestFile)
   ]);
   if (keyFile && !externalKeyDescriptor.pubkey) {
     exit("Public key missing from key file", internal);
@@ -935,7 +934,7 @@ var verifySignature2 = async (args, internal = false) => {
 
 // src/version.ts
 function version() {
-  console.log("2.1.0");
+  console.log("2.1.1");
 }
 
 // src/main.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chelonia/cli",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Chelonia Command-line Interface",
   "main": "src/main.ts",
   "scripts": {

src/manifest.ts

@@ -7,15 +7,14 @@
 
 import { flags, path, colors } from './deps.ts'
 import { hash } from './hash.ts'
-import { exit, importJsonFile, revokeNet } from './utils.ts'
+import { exit, readJsonFile, revokeNet } from './utils.ts'
 import { EDWARDS25519SHA512BATCH, deserializeKey, keyId, serializeKey, sign } from './lib/crypto.ts'
 
 // import { writeAllSync } from "https://deno.land/[email protected]/streams/mod.ts"
 
 export async function manifest (args: string[]) {
   await revokeNet()
   const parsedArgs = flags.parse(args, { collect: ['key'], alias: { 'key': 'k' } })
-  console.log(parsedArgs)
   const [keyFile, contractFile] = parsedArgs._
   const parsedFilepath = path.parse(contractFile as string)
   const { name: contractName, base: contractBasename, dir: contractDir } = parsedFilepath
@@ -24,15 +23,15 @@ export async function manifest (args: string[]) {
   const outFilepath = path.join(contractDir, `${contractName}.${version}.manifest.json`)
   if (!keyFile) exit('Missing signing key file')
 
-  const signingKeyDescriptor = await importJsonFile(keyFile)
+  const signingKeyDescriptor = await readJsonFile(keyFile)
   const signingKey = deserializeKey(signingKeyDescriptor.privkey)
 
   // Add all additional public keys in addition to the signing key
   const publicKeys = Array.from(new Set(
     [serializeKey(signingKey, false)]
       .concat(...await Promise.all(parsedArgs.key?.map(
         async (kf: number | string) => {
-          const descriptor = await importJsonFile(kf)
+          const descriptor = await readJsonFile(kf)
           const key = deserializeKey(descriptor.pubkey)
           if (key.type !== EDWARDS25519SHA512BATCH) {
             exit(`Invalid key type ${key.type}; only ${EDWARDS25519SHA512BATCH} keys are supported.`)

src/utils.ts

@@ -127,10 +127,7 @@ export async function revokeNet () {
   await Deno.permissions.revoke({ name: 'net' })
 }
 
-export const importJsonFile = async (file: unknown) => {
-  const data = await import(
-    path.toFileUrl(path.resolve(String(file))).toString(),
-    { with: { type: 'json' }}
-  )
-  return data.default
+export const readJsonFile = async (file: unknown) => {
+  const contents = await Deno.readTextFile(path.resolve(String(file)))
+  return JSON.parse(contents)
 }

src/verifySignature.ts

@@ -1,16 +1,16 @@
 import { hash } from './commands.ts'
 import { colors, flags, path } from './deps.ts'
 import { verifySignature as cryptoVerifySignature, deserializeKey, keyId } from './lib/crypto.ts'
-import { exit, importJsonFile, revokeNet } from './utils.ts'
+import { exit, readJsonFile, revokeNet } from './utils.ts'
 
 export const verifySignature = async (args: string[], internal = false) => {
   await revokeNet()
   const parsedArgs = flags.parse(args)
   const [manifestFile] = parsedArgs._
   const keyFile = parsedArgs.k
   const [externalKeyDescriptor, manifest] = await Promise.all([
-    keyFile ? importJsonFile(keyFile) : null,
-    importJsonFile(manifestFile)
+    keyFile ? readJsonFile(keyFile) : null,
+    readJsonFile(manifestFile)
   ])
   if (keyFile && !externalKeyDescriptor.pubkey) {
     exit('Public key missing from key file', internal)