yukichant 2.2.1 → 3.0.2

package/.github/workflows/jest-test.yml

@@ -0,0 +1,26 @@
+name: Node CI
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [ 12.x, 14.x, 16.x ]
+
+    steps:
+    - run: node -v
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: node -v
+    - run: npm ci
+    - run: npm test

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,36 @@
+name: npm-publish
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js And Setup .npmrc
+        uses: actions/setup-node@v2
+        with:
+          node-version: '12.x'
+          registry-url: 'https://registry.npmjs.org'
+          always-auth : true
+        env :
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Can Publish
+        run : npx can-npm-publish --verbose
+        env :
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Install
+        run : npm install
+
+      - name: Publish
+        run : npm publish --access=public
+        env :
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/README.md

@@ -1,6 +1,6 @@
 # yukichant
 
-[![Build Status](https://travis-ci.org/amanoese/yukichant.svg?branch=master)](https://travis-ci.org/amanoese/yukichant)
+[![Actions Status](https://github.com/amanoese/yukichant/workflows/Node%20CI/badge.svg)](https://github.com/amanoese/yukichant/actions)
 [![npm version](http://img.shields.io/npm/v/yukichant.svg)](https://npmjs.org/package/yukichant)
 
 yukichantは、テキストデータを詠唱呪文に変換するコマンドです。  

package/{jest.config.js → jest.config.cjs}

@@ -129,8 +129,7 @@ module.exports = {
   // snapshotSerializers: [],
 
   // The test environment that will be used for testing
-  testEnvironment: "node",
-
+  testEnvironment: 'jest-environment-node',
   // Options that will be passed to the testEnvironment
   // testEnvironmentOptions: {},
 
@@ -165,6 +164,7 @@ module.exports = {
 
   // A map from regular expressions to paths to transformers
   // transform: null,
+  transform: {}
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yukichant",
-  "version": "2.2.1",
+  "version": "3.0.2",
   "description": "",
   "license": "Apache-2.0",
   "repository": "amanoese/yukichant",
@@ -12,22 +12,22 @@
   "scripts": {
     "dev": "src/cli.js",
     "json-generate": "raw_data/json_generator",
-    "test": "jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "deploy": "npm version patch && git push origin $(git describe --tags --abbrev=0)"
   },
   "devDependencies": {
-    "jest": "^24.8.0",
-    "jest-extended": "^0.11.2"
+    "jest": "^27.4.7",
+    "jest-extended": "^1.2.0"
   },
   "dependencies": {
-    "caporal": "^1.3.0",
-    "core-js": "^3.2.0",
-    "get-stdin": "^7.0.0",
-    "util": "^0.12.1"
+    "commander": "^8.3.0",
+    "get-stdin": "^9.0.0"
   },
   "keywords": [
     "cli",
     "terminal",
     "unicode"
-  ]
+  ],
+  "type": "module",
+  "node": ">=12.22.8"
 }

package/src/cli.js

@@ -1,17 +1,22 @@
 #!/usr/bin/env node
-const prog = require('caporal')
-const getStdin = require('get-stdin')
-const chant = require('./index.js')
+import getStdin from 'get-stdin'
+import chant from './index.js'
+import fs from 'fs'
+import path from 'path'
+const dirname = path.dirname(new URL(import.meta.url).pathname)
+const { version } = JSON.parse(fs.readFileSync(`${dirname}/../package.json`));
 
-prog
+import { Command } from 'commander/esm.mjs';
+const program = new Command();
+
+program
 .name('yukichant')
 .description('yukichant is convert text to magic spell.')
-.bin('chant')
-.version(require('../package.json').version)
-.argument('[text]','input text',null,'')
+.version(version)
+.argument('[text]','input text','')
 .option('-d','decode flag')
-.action(async (args,option)=>{
-  let inputText = args.text || (await getStdin())
+.action(async (text,option)=>{
+  let inputText = text || (await getStdin())
   if (inputText == '') {
     console.log(chant.generate())
   } else if (option.d){
@@ -20,5 +25,4 @@ prog
     console.log(chant.encode(inputText))
   }
 })
-
-prog.parse(process.argv)
+.parse(process.argv);

package/src/index.js

@@ -1,9 +1,9 @@
-require('core-js')
-const util  = require('util')
-const simpleEnigma = require('./machine-encrypt')
-
-const meisi = require('../data/meisi.json')
-const dousi = require('../data/dousi.json')
+import simpleEnigma from './machine-encrypt.js'
+import fs from 'fs'
+import path from 'path'
+const dirname = path.dirname(new URL(import.meta.url).pathname)
+const meisi = JSON.parse(fs.readFileSync(`${dirname}/../data/meisi.json`, 'utf8'));
+const dousi = JSON.parse(fs.readFileSync(`${dirname}/../data/dousi.json`, 'utf8'));
 
 
 let default_encoder = (uint8text,{ meisi, dousi }) => {
@@ -83,7 +83,7 @@ let default_decoder = (encodeText,{ meisi, dousi }) => {
   return Uint8Array.from(textCode)
 }
 
-module.exports = {
+export default {
   data : {
     meisi,
     dousi
@@ -94,11 +94,11 @@ module.exports = {
     return generater(uint8text,data)
   },
   encode( text, data = this.data, encoder = default_encoder ){
-    let uint8text = (TextEncoder ? new TextEncoder() : new util.TextEncoder()).encode(text)
+    let uint8text = (new TextEncoder()).encode(text)
     return encoder(uint8text,data)
   },
   decode( text, data = this.data, decoder = default_decoder ){
     let uint8text = decoder(text,data)
-    return (TextDecoder ? new TextDecoder() : new util.TextDecoder()).decode(uint8text)
+    return (new TextDecoder()).decode(uint8text)
   }
 }

package/src/machine-encrypt.js

@@ -14,11 +14,12 @@ let encrypt = (uint8array,roter,refrector) => {
   return [fase_3, ...(uint8array.length <= 1 ? [] : encrypt(uint8array.slice(1),nextRotor,refrector)) ]
 }
 
-module.exports = {
+export default  {
   default_roter,
   refrector,
   encrypt,
-  uint8ArrayEncrypt(uint8array){
-    return this.encrypt(uint8array,this.default_roter,this.refrector)
+  uint8ArrayEncrypt(uint8array) {
+    return this.encrypt(uint8array,this.default_roter,this.refrector);
   }
 }
+

package/test_data/help_message.js

@@ -0,0 +1,13 @@
+const message = `Usage: yukichant [options] [text]
+
+yukichant is convert text to magic spell.
+
+Arguments:
+  text           input text (default: "")
+
+Options:
+  -V, --version  output the version number
+  -d             decode flag
+  -h, --help     display help for command
+`
+export default message