fix: update, bump version 0.4.0

andreas-timm · andreas-timm · commit 3d1a6bb3ec2b · 2024-06-14T23:33:41.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.4.0] - 2024-06-14
+- Fix new line
+- Update / improve
+
 ## [0.3.0] - 2024-06-13
 
 ### Added
diff --git a/package.json b/package.json
@@ -1,6 +1,5 @@
 {
   "name": "code-signature-ts",
-  "version": "0.3.0",
   "module": "src/code-signature.ts",
   "devDependencies": {
     "@types/bun": "^1.1.2",
diff --git a/src/code-signature.ts b/src/code-signature.ts
@@ -4,51 +4,38 @@
 // To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/
 // Author: Andreas Timm
 // Repository: https://github.com/andreas-timm/code-signature-ts
-// Version: 0.3.0
-// @sha256sum 0x904d8038d8a3ae6144e5b4275c5f5c76b3d28bddf574ada8cc394fb091a3e2c5
-// @eip191signature 0x6b55e4c5241cf7824a70f3f971b16be497ad5e2d808daca00280c975a5604a396a2fdfcf5d30d6f7c15c84a4f5a44d813311d7231acc7b2041a1aa20574e8c851b
+// Version: 0.4.0
+// @sha256sum 0xe901425d12469ef7e0fdd010e2d158d5398a8a6ae7e1a79bce1f77a6b9d3237b
+// @eip191signature 0x3b08f924e994205005312fec95c30e181fb066744ca51a17d122221953cda7e37abec4184e1755385cae7837cea1a6e6f74b3d336484026338bf6d2426e9f9be1c
 
 import { parseArgs } from 'util'
 import { hashMessage, recoverAddress, sha256 } from 'viem'
 import { english, generateMnemonic, mnemonicToAccount } from 'viem/accounts'
 import type { Options, SignResult, VerifyResult, CliOptions } from './types.ts'
 
-export function splitIndexLines(content: string) {
-    return content.split(/(\n+)/).reduce((acc: string[][], part: string, index: number) => {
-        if (index % 2 === 0) {
-            acc.push([part])
-        } else {
-            acc[acc.length - 1].push(part)
-        }
-        return acc
-    }, [])
-}
-
 export function getFilteredContent(content: string, key: string, prefix: string, replace?: string) {
-    const lines = splitIndexLines(content)
     let filtered = []
     let value: null | `0x${string}` = null
+    const lines = content.split('\n')
     let index
+    let line: string
 
     for (index = 0; index < lines.length; index++) {
-        if (lines[index][0].match(new RegExp(`^\\s*([*#;"]|${prefix})?\\s*` + key))) {
-            value = lines[index][0].match(new RegExp(`${key}\\s+(\\S+)`))![1] as `0x${string}`
+        line = lines[index]
+
+        if (value === null && line.match(new RegExp(`^\\s*([*#;"]|${prefix})?\\s*${key} 0x\\S+`))) {
+            value = line.match(new RegExp(`${key}\\s+(0x\\S+)`))![1] as `0x${string}`
             if (replace !== undefined) {
-                filtered.push(
-                    [
-                        lines[index][0].replace(new RegExp(`(${key}\\s+)\\S+`), `\$1${replace}`),
-                        lines[index][1],
-                    ].join(''),
-                )
+                line = line.replace(new RegExp(`(${key}\\s+)\\S+`), `\$1${replace}`)
+            } else {
+                continue
             }
-            filtered = filtered.concat(lines.splice(index + 1).map((line) => line.join('')))
-            break
         }
 
-        filtered.push(lines[index].join(''))
+        filtered.push(line)
     }
 
-    return { content: filtered.join(''), value }
+    return { content: filtered.join('\n'), value }
 }
 
 export async function verify(content: string, prefix: string): Promise<VerifyResult> {
@@ -87,30 +74,32 @@ export async function sign(verifyResult: VerifyResult, options: Options): Promis
         console.log('Address:', account.address)
     }
 
-    let valid = account.address === verifyResult.address
-    let signature: null | `0x${string}` = null
-    let toSha256Content: null | string = null
-    let sha256sum: null | `0x${string}` = null
-    let signedContent: null | string = null
+    let signature: null | `0x${string}`
+    let toSha256Content: null | string
+    let sha256sum: null | `0x${string}`
+    let signedContent: null | string
 
-    if (!valid || !verifyResult.sha256Valid) {
-        signature = await account.signMessage({ message: verifyResult.signFiltered.content })
+    signature = await account.signMessage({ message: verifyResult.signFiltered.content })
 
-        if (verifyResult.signFiltered.value !== null) {
-            toSha256Content = getFilteredContent(verifyResult.content, '@eip191signature', options.prefix, signature).content
-        } else {
-            toSha256Content = [`${options.prefix} @eip191signature ` + signature, verifyResult.content].join('\n')
-        }
+    if (verifyResult.signFiltered.value !== null) {
+        toSha256Content = getFilteredContent(
+            verifyResult.content,
+            '@eip191signature',
+            options.prefix,
+            signature,
+        ).content
+    } else {
+        toSha256Content = [`${options.prefix} @eip191signature ` + signature, verifyResult.content].join('\n')
+    }
 
-        sha256sum = sha256(
-            new TextEncoder().encode(getFilteredContent(toSha256Content, '@sha256sum', options.prefix).content),
-        )
+    sha256sum = sha256(
+        new TextEncoder().encode(getFilteredContent(toSha256Content, '@sha256sum', options.prefix).content),
+    )
 
-        if (verifyResult.sha256Filtered.value !== null) {
-            signedContent = getFilteredContent(toSha256Content, '@sha256sum', options.prefix, sha256sum).content
-        } else {
-            signedContent = [`${options.prefix} @sha256sum ` + sha256sum, toSha256Content].join('\n')
-        }
+    if (verifyResult.sha256Filtered.value !== null) {
+        signedContent = getFilteredContent(toSha256Content, '@sha256sum', options.prefix, sha256sum).content
+    } else {
+        signedContent = [`${options.prefix} @sha256sum ` + sha256sum, toSha256Content].join('\n')
     }
 
     return {
@@ -126,7 +115,7 @@ function printHelp() {
     console.log('Usage: code-signature-ts [OPTIONS] <FILE|->')
     console.log('OPTIONS:')
     console.log('  --verify, -v — only verify')
-    console.log('  --write, -f — write file')
+    console.log('  --write, -w — write file')
     console.log('  --silent, -s — silent')
     console.log('  --prefix, -p — commented line prefix')
     console.log('  --out, -o — output file')
@@ -159,42 +148,48 @@ export async function codeSignature(options: Options) {
 
     const verifyResult = await verify(content, options.prefix)
     let signResult: null | SignResult = null
-    let fail = false
+    let fail = true
 
     if (verifyResult.sha256Valid) {
         if (!options.silent) {
             console.log(`OK: ${verifyResult.address}`)
         }
-    } else if (!options.verify) {
+        fail = false
+    }
+
+    if (!options.verify) {
         signResult = await sign(verifyResult, options)
 
-        if (signResult.signedContent === null) {
+        if (signResult.signedContent !== null) {
+            if (options.write && fail) {
+                await write(options, signResult.signedContent)
+            }
+
+            if (fail && !options.write && !options.silent) {
+                console.log(`${options.prefix} @sha256sum ${signResult.sha256sum}`)
+                console.log(`${options.prefix} @eip191signature ${signResult.signature}`)
+            }
+        } else {
             console.log('ERROR: no signed content')
             fail = true
-        } else if (options.write) {
-            await write(options, signResult.signedContent)
-        } else if (!options.silent) {
-            console.log(`${options.prefix} @sha256sum ${signResult.sha256sum}`)
-            console.log(`${options.prefix} @eip191signature ${signResult.signature}`)
         }
-    } else {
-        if (!options.silent) {
-            console.log('SHA256: ERROR')
-        }
-        fail = true
+    }
+
+    if (fail && !options.silent) {
+        console.log('SHA256: ERROR')
     }
 
     return { verifyResult, signResult, fail }
 }
 
 if (import.meta.main) {
-    const {values, positionals} = parseArgs({
+    const { values, positionals } = parseArgs({
         args: Bun.argv,
         options: {
-            help: { type: 'boolean', short: 'h' },
-            write: { type: 'boolean', short: 'w' },
-            verify: { type: 'boolean', short: 'v' },
-            silent: { type: 'boolean', short: 's' },
+            help: { type: 'boolean', short: 'h', default: false },
+            write: { type: 'boolean', short: 'w', default: false },
+            verify: { type: 'boolean', short: 'v', default: false },
+            silent: { type: 'boolean', short: 's', default: false },
             prefix: { type: 'string', short: 'p', default: '//' },
             out: { type: 'string', short: 'o' },
         },
diff --git a/src/types.ts b/src/types.ts
@@ -1,12 +1,13 @@
 import type { Address } from 'viem'
 
 export type CliOptions = {
-    help?: boolean,
-    write?: boolean,
-    verify?: boolean,
-    silent?: boolean,
-    prefix: string,
-    out?: string,
+    help: boolean
+    write: boolean
+    force: boolean
+    verify: boolean
+    silent: boolean
+    prefix: string
+    out?: string
 }
 
 export type Options = CliOptions & {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "code-signature-ts",`
`3`		`- "version": "0.3.0",`
`4`	`3`	`"module": "src/code-signature.ts",`
`5`	`4`	`"devDependencies": {`
`6`	`5`	`"@types/bun": "^1.1.2",`