Merge pull request #72 from ilo-token/master

0.5.0

Author: neverRare

.github/workflows/build_and_deploy.yml

@@ -0,0 +1,41 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches: ["release"]
+
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+      - name: Build
+        run: deno task build
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "dist/"
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/deno.yml

@@ -1,41 +1,24 @@
-name: Build and Deploy
+name: Deno
 
 on:
   push:
-    branches: ["release"]
-
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
+    branches: ["master"]
 
 jobs:
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Setup Deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
           deno-version: v2.x
-      - name: Build
-        run: deno task build
-      - name: Setup Pages
-        uses: actions/configure-pages@v4
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: "dist/"
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Build Dictionary
+        run: deno task build-dictionary
+      - name: Check formatting
+        run: deno fmt --check
+      - name: Lint
+        run: deno lint
+      - name: Test
+        run: deno test

CHANGELOG.md

@@ -15,15 +15,52 @@ On this on-development version, things can be broken.
 </details>
 -->
 
+## 0.5.0
+
+ilo Token can now translate "o" imperative sentences such as "o toki" and "mi o
+lape".
+
+You can now have custom fillers in custom dictionary:
+
+```
+wa:
+  wow/woow/wooow(f);
+```
+
+With this definition, ilo Token can translate "waaaa" into "woooow". There is no
+repetition pattern to follow for toki pona words. "wwaaa" is just as valid.
+
+You can also now have custom numerals:
+
+```
+san:
+  3(num);
+```
+
+- Implement translation of "o" imperative sentences.
+- Allow custom fillers.
+- Allow custom numerals.
+- Numerals are now very permissive. Something like "wan tu" is now allowed. It
+  is also possible for ilo Token to output both numbers using pu system and
+  nasin nanpa pona: "tu ale wan" will be translated into 103 (pu system) _and_
+  201 (nasin nanpa pona).
+- Support for long "anu" glyph.
+- Fix sentence capitalization: If the sentence starts with number, no
+  capitalization will occur.
+
 ## 0.4.1
 
-ilo Token is now a lot faster.
+Released 27 Feb 2025
+
+ilo Token is now a lot faster. In exchange, it now uses more memory.
 
 - Fix custom dictionary error messages.
 - Fix custom dictionary not loading when ilo Token is newly loaded.
 
 ## 0.4.0
 
+Released 19 Feb 2025
+
 ilo Token can now translate into verbs! This means it can translate sentences!
 It still can't do the following however:
 

README.md

@@ -52,5 +52,5 @@ This will run a REPL that you can use to test ilo Token. To stop this command,
 simply press Ctrl + D or Ctrl + C.
 
 ```
-deno task run
+deno task repl
 ```

bundle.ts

@@ -8,12 +8,12 @@ const WATCH = [
   "./dictionary/misc.ts",
   "./dictionary/parser.ts",
   "./dictionary/type.ts",
-  "./telo-misikeke/linku-data.json",
-  "./telo-misikeke/Parser.js",
-  "./telo-misikeke/rules.js",
-  "./telo-misikeke/telo-misikeke.js",
+  "./telo_misikeke/linku_data.json",
+  "./telo_misikeke/Parser.js",
+  "./telo_misikeke/rules.js",
+  "./telo_misikeke/telo_misikeke.js",
   "./src/",
-  "./project-data.json",
+  "./project_data.json",
 ];
 const DICTIONARY = /dictionary[/\\][^/\\]+$/;
 
@@ -25,24 +25,30 @@ function buildOptions(minify: boolean): ESBuild.BuildOptions {
     bundle: true,
     minify,
     sourcemap: "linked",
+    target: [`es${new Date().getFullYear() - 3}`],
     plugins: [...denoPlugins()],
   };
 }
-async function buildAll(options: {
-  minify: boolean;
-  buildDictionary: boolean;
-  checkDictionary?: boolean;
-}): Promise<void> {
+async function buildAll(
+  options: Readonly<{
+    minify: boolean;
+    buildDictionary: boolean;
+    checkDictionary?: boolean;
+  }>,
+): Promise<void> {
   const { minify, buildDictionary, checkDictionary } = options;
   try {
     if (buildDictionary) {
       const Dictionary = await import("./dictionary/build.ts");
       await Dictionary.build(checkDictionary ?? true);
     }
+    // deno-lint-ignore no-console
     console.log("Building main.js...");
     await ESBuild.build(buildOptions(minify));
+    // deno-lint-ignore no-console
     console.log("Building done!");
   } catch (error) {
+    // deno-lint-ignore no-console
     console.error(error);
   }
 }
@@ -53,33 +59,29 @@ if (import.meta.main) {
       break;
     }
     case "watch": {
+      // deno-lint-ignore no-console
       console.log("Press ctrl+c to exit.");
       const watcher = Deno.watchFs(WATCH);
       let task = Promise.resolve();
-      try {
-        await buildAll({ minify: false, buildDictionary: true });
-        let dictionaryChanged = false;
-        const buildDebounced = debounce((buildDictionary: boolean) => {
-          task = task.then(async () => {
-            await buildAll({
-              minify: true,
-              buildDictionary,
-              checkDictionary: false,
-            });
-            dictionaryChanged = false;
+      await buildAll({ minify: false, buildDictionary: true });
+      let dictionaryChanged = false;
+      const buildDebounced = debounce((buildDictionary: boolean) => {
+        task = task.then(async () => {
+          await buildAll({
+            minify: false,
+            buildDictionary,
+            checkDictionary: false,
           });
-        }, 500);
-        for await (const event of watcher) {
-          if (event.paths.some((path) => DICTIONARY.test(path))) {
-            dictionaryChanged = true;
-          }
-          buildDebounced(dictionaryChanged);
+          dictionaryChanged = false;
+        });
+      }, 500);
+      for await (const event of watcher) {
+        if (event.paths.some((path) => DICTIONARY.test(path))) {
+          dictionaryChanged = true;
         }
-        throw new Error("unreachable");
-      } finally {
-        watcher.close();
-        await task;
+        buildDebounced(dictionaryChanged);
       }
+      throw new Error("unreachable");
     }
     default:
       throw new Error(`unrecognized build option: ${Deno.args[0]}`);

deno.json

@@ -4,43 +4,63 @@
   },
   "tasks": {
     "build": "deno run --allow-read --allow-write --allow-env --allow-net --allow-run --no-prompt ./bundle.ts build",
-    "run": {
-      "command": "deno run --allow-env --no-prompt ./src/repl.ts",
+    "repl": {
+      "command": "deno run --no-prompt ./src/repl.ts",
       "dependencies": ["build-dictionary"]
     },
     "start": "deno run --allow-net --allow-read --no-prompt jsr:@std/http/file-server ./dist/",
     "watch": "deno run --allow-read --allow-write --allow-env --allow-net --allow-run --no-prompt ./bundle.ts watch",
-    "update": "deno outdated --update && deno run --allow-write --allow-net --no-prompt ./telo-misikeke/update.ts",
+    "update": "deno outdated --update && deno run --allow-write --allow-net --no-prompt ./telo_misikeke/update.ts",
     "build-dictionary": "deno run --allow-read --allow-write --no-prompt ./dictionary/build.ts"
   },
   "fmt": {
     "exclude": [
       "./dictionary/dictionary.ts",
       "./dist/main.js",
-      "./telo-misikeke/linku-data.json",
-      "./telo-misikeke/rules.js",
-      "./telo-misikeke/Parser.js"
+      "./telo_misikeke/linku_data.json",
+      "./telo_misikeke/rules.js",
+      "./telo_misikeke/Parser.js"
     ]
   },
   "lint": {
     "exclude": [
       "./dictionary/dictionary.ts",
       "./dist/main.js",
-      "./telo-misikeke/rules.js",
-      "./telo-misikeke/Parser.js"
+      "./telo_misikeke/rules.js",
+      "./telo_misikeke/Parser.js"
     ],
     "rules": {
+      "tags": ["recommended"],
+      "include": [
+        "camelcase",
+        "explicit-function-return-type",
+        "explicit-module-boundary-types",
+        "no-console",
+        "no-boolean-literal-for-arguments",
+        "no-eval",
+        "no-inferrable-types",
+        "no-non-null-asserted-optional-chain",
+        "no-self-compare",
+        "no-sparse-arrays",
+        "no-sync-fn-in-async-fn",
+        "no-throw-literal",
+        "no-useless-rename",
+        "prefer-ascii",
+        "single-var-declarator"
+      ],
       "exclude": ["no-explicit-any"]
     }
   },
   "imports": {
     "@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@^0.11.1",
-    "@std/async": "jsr:@std/async@^1.0.10",
+    "@std/assert": "jsr:@std/assert@^1.0.11",
+    "@std/async": "jsr:@std/async@^1.0.11",
     "@std/cache": "jsr:@std/cache@^0.1.3",
     "@std/collections": "jsr:@std/collections@^1.0.10",
     "@std/html": "jsr:@std/html@^1.0.3",
     "@std/random": "jsr:@std/random@^0.1.0",
-    "@std/text": "jsr:@std/text@^1.0.10",
+    "@std/regexp": "jsr:@std/regexp@^1.0.1",
+    "@std/text": "jsr:@std/text@^1.0.11",
     "compromise": "npm:compromise@^14.14.3",
     "esbuild": "npm:esbuild@^0.25.0"
   }