Merge pull request #65 from dojyorin/dev

feat: import assert and fix width.

deps.test.ts

@@ -1,4 +1,4 @@
-export {assertEquals} from "https://deno.land/std@0.194.0/testing/asserts.ts";
-export {dirname, fromFileUrl} from "https://deno.land/std@0.194.0/path/mod.ts";
-export {serve} from "https://deno.land/std@0.194.0/http/mod.ts";
-export {exists} from "https://deno.land/std@0.194.0/fs/mod.ts";
+export {assertEquals} from "https://deno.land/std@0.195.0/testing/asserts.ts";
+export {dirname, fromFileUrl} from "https://deno.land/std@0.195.0/path/mod.ts";
+export {serve} from "https://deno.land/std@0.195.0/http/mod.ts";
+export {exists} from "https://deno.land/std@0.195.0/fs/mod.ts";

deps.ts

@@ -1,4 +1,4 @@
-export {dirname, fromFileUrl} from "https://deno.land/std@0.194.0/path/mod.ts";
-export {Logger} from "https://deno.land/std@0.194.0/log/mod.ts";
-export {ConsoleHandler, FileHandler} from "https://deno.land/std@0.194.0/log/handlers.ts";
-export {format as formatDate} from "https://deno.land/std@0.194.0/datetime/mod.ts";
+export {dirname, fromFileUrl} from "https://deno.land/std@0.195.0/path/mod.ts";
+export {Logger} from "https://deno.land/std@0.195.0/log/mod.ts";
+export {ConsoleHandler, FileHandler} from "https://deno.land/std@0.195.0/log/handlers.ts";
+export {format as formatDate} from "https://deno.land/std@0.195.0/datetime/mod.ts";

mod.test.ts

@@ -3,6 +3,7 @@ import "./test/crypto.test.ts";
 import "./test/deep.test.ts";
 import "./test/deflate.test.ts";
 import "./test/fetch.test.ts";
+import "./test/import.test.ts";
 import "./test/json.deno.test.ts";
 import "./test/log.deno.test.ts";
 import "./test/minipack.test.ts";

mod.ts

@@ -3,6 +3,7 @@ export * from "./src/crypto.ts";
 export * from "./src/deep.ts";
 export * from "./src/deflate.ts";
 export * from "./src/fetch.ts";
+export * from "./src/import.ts";
 export * from "./src/minipack.ts";
 export * from "./src/text.ts";
 export * from "./src/time.ts";

mod.universal.ts

@@ -3,6 +3,7 @@ export * from "./src/crypto.ts";
 export * from "./src/deep.ts";
 export * from "./src/deflate.ts";
 export * from "./src/fetch.ts";
+export * from "./src/import.ts";
 export * from "./src/minipack.ts";
 export * from "./src/text.ts";
 export * from "./src/time.ts";

src/import.ts

@@ -0,0 +1,15 @@
+/**
+* Define import assertion on dynamic import.
+* Default to JSON.
+* @example
+* ```ts
+* const {default: json} = await import("./data.json", importAssert());
+* ```
+*/
+export function importAssert(type?:string):ImportCallOptions{
+    return {
+        assert: {
+            type: type ?? "json"
+        }
+    };
+}

src/json.deno.ts

@@ -1,3 +1,4 @@
+import {type Opt} from "./deep.ts";
 import {mainPath} from "./path.deno.ts";
 
 /**
@@ -7,7 +8,7 @@ import {mainPath} from "./path.deno.ts";
 * const object = await jsonRead("./resource.json");
 * ```
 */
-export async function jsonRead<T extends unknown>(path:string):Promise<T>{
+export async function jsonRead<T extends Opt<T>>(path:string):Promise<T>{
     return JSON.parse(await Deno.readTextFile(path));
 }
 
@@ -20,7 +21,7 @@ export async function jsonRead<T extends unknown>(path:string):Promise<T>{
 * });
 * ```
 */
-export async function jsonWrite<T extends unknown>(path:string, data:T):Promise<void>{
+export async function jsonWrite<T extends Opt<T>>(path:string, data:T):Promise<void>{
     await Deno.writeTextFile(path, JSON.stringify(data, undefined, 4));
 }
 
@@ -34,7 +35,7 @@ export async function jsonWrite<T extends unknown>(path:string, data:T):Promise<
 * const resource = await jsonLoad("./resource.json", dresource);
 * ```
 */
-export async function jsonLoad<T extends unknown>(path:string, def:T):Promise<T>{
+export async function jsonLoad<T extends Opt<T>>(path:string, def:T):Promise<T>{
     try{
         return await jsonRead<T>(path);
     }
@@ -59,6 +60,6 @@ export async function jsonLoad<T extends unknown>(path:string, def:T):Promise<T>
 * const config = await configLoad(dconfig);
 * ```
 */
-export async function configLoad<T extends unknown>(def:T):Promise<T>{
+export async function configLoad<T extends Opt<T>>(def:T):Promise<T>{
     return await jsonLoad(`${mainPath()}/config.json`, def);
 }

src/log.deno.ts

@@ -7,32 +7,36 @@ function logRecord(date:Date, level:string, message:string){
 
 /**
 * Instantiate logger with general configuration.
-* Output to console and file.
-* Log file default save path is `${Deno.mainModule}/operation.log`.
+* Output to console and also to file if `name` is defined.
+* Log file default save path is `${Deno.mainModule}/${name}.log`.
 * @example
 * ```ts
 * const log = logEntry();
 * ```
 */
 export function logEntry(name?:string):Logger{
-    const title = name ?? "operation";
     const level = "INFO";
 
-    const log = new Logger(title, level, {
+    const log = new Logger("operation", level, {
         handlers: [
             new ConsoleHandler(level, {
                 formatter({datetime, levelName, msg}){
                     return logRecord(datetime, levelName, msg);
                 }
-            }),
+            })
+        ]
+    });
+
+    if(name){
+        log.handlers.push(...[
             new FileHandler(level, {
-                filename: `${mainPath()}/${title}.log`,
+                filename: `${mainPath()}/${name}.log`,
                 formatter({datetime, levelName, msg}){
                     return logRecord(datetime, levelName, msg);
                 }
             })
-        ]
-    });
+        ]);
+    }
 
     for(const h of log.handlers){
         h.setup();

src/path.deno.ts

@@ -6,10 +6,10 @@ import {isWin} from "./platform.deno.ts";
 * Useful for converting from Windows path to UNIX path.
 * @example
 * ```ts
-* const path = slashUnix("C:\\file");
+* const path = slashU("C:\\file");
 * ```
 */
-export function slashUnix(path:string):string{
+export function slashU(path:string):string{
     return path.replace(/\\/g, "/");
 }
 
@@ -18,10 +18,10 @@ export function slashUnix(path:string):string{
 * Useful for converting from UNIX path to Windows path.
 * @example
 * ```ts
-* const path = slashWin("C:/file");
+* const path = slashW("C:/file");
 * ```
 */
-export function slashWin(path:string):string{
+export function slashW(path:string):string{
     return path.replace(/\//g, "\\");
 }
 
@@ -60,7 +60,7 @@ export function dataPath():string{
 export function homePath():string{
     const {HOME, USERPROFILE} = Deno.env.toObject();
 
-    return isWin() ? slashUnix(USERPROFILE) : HOME;
+    return isWin() ? slashU(USERPROFILE) : HOME;
 }
 
 /**
@@ -73,5 +73,5 @@ export function homePath():string{
 export function mainPath():string{
     const path = fromFileUrl(dirname(Deno.mainModule));
 
-    return isWin() ? slashUnix(path) : path;
+    return isWin() ? slashU(path) : path;
 }

src/text.ts

@@ -62,6 +62,58 @@ export function trimExtend(data:string):string{
     return data.trim().replace(/\r/g, "").replace(/ +/g, " ").replace(/\t+/g, "\t").replace(/\n+/g, "\n").replace(/^ /mg, "").replace(/ $/mg, "");
 }
 
+/**
+* Convert half-width Japanese kana to full-width and full-width alphanumeric symbols to half-width.
+* @example
+* ```ts
+* const text = "１＋１＝２";
+* const formated = fixWidth(text);
+* ```
+*/
+export function fixWidth(data:string){
+    return Object.entries({
+        "ｳﾞ": "ヴ",
+        "ｶﾞ": "ガ", "ｷﾞ": "ギ", "ｸﾞ": "グ", "ｹﾞ": "ゲ", "ｺﾞ": "ゴ",
+        "ｻﾞ": "ザ", "ｼﾞ": "ジ", "ｽﾞ": "ズ", "ｾﾞ": "ゼ", "ｿﾞ": "ゾ",
+        "ﾀﾞ": "ダ", "ﾁﾞ": "ヂ", "ﾂﾞ": "ヅ", "ﾃﾞ": "デ", "ﾄﾞ": "ド",
+        "ﾊﾞ": "バ", "ﾋﾞ": "ビ", "ﾌﾞ": "ブ", "ﾍﾞ": "ベ", "ﾎﾞ": "ボ",
+        "ﾊﾟ": "パ", "ﾋﾟ": "ピ", "ﾌﾟ": "プ", "ﾍﾟ": "ペ", "ﾎﾟ": "ポ",
+        "ｱ": "ア", "ｲ": "イ", "ｳ": "ウ", "ｴ": "エ", "ｵ": "オ",
+        "ｶ": "カ", "ｷ": "キ", "ｸ": "ク", "ｹ": "ケ", "ｺ": "コ",
+        "ｻ": "サ", "ｼ": "シ", "ｽ": "ス", "ｾ": "セ", "ｿ": "ソ",
+        "ﾀ": "タ", "ﾁ": "チ", "ﾂ": "ツ", "ﾃ": "テ", "ﾄ": "ト",
+        "ﾅ": "ナ", "ﾆ": "ニ", "ﾇ": "ヌ", "ﾈ": "ネ", "ﾉ": "ノ",
+        "ﾊ": "ハ", "ﾋ": "ヒ", "ﾌ": "フ", "ﾍ": "ヘ", "ﾎ": "ホ",
+        "ﾏ": "マ", "ﾐ": "ミ", "ﾑ": "ム", "ﾒ": "メ", "ﾓ": "モ",
+        "ﾔ": "ヤ", "ﾕ": "ユ", "ﾖ": "ヨ",
+        "ﾗ": "ラ", "ﾘ": "リ", "ﾙ": "ル", "ﾚ": "レ", "ﾛ": "ロ",
+        "ﾜ": "ワ", "ｦ": "ヲ", "ﾝ": "ン",
+        "ｧ": "ァ", "ｨ": "ィ", "ｩ": "ゥ", "ｪ": "ェ", "ｫ": "ォ",
+        "ｯ": "ッ",
+        "ｬ": "ャ", "ｭ": "ュ", "ｮ": "ョ",
+        "､": "、", "｡": "。", "･": "・", "ｰ": "ー", "｢": "「", "｣": "」",
+        "Ａ": "A", "Ｂ": "B", "Ｃ": "C", "Ｄ": "D", "Ｅ": "E", "Ｆ": "F", "Ｇ": "G", "Ｈ": "H", "Ｉ": "I", "Ｊ": "J", "Ｋ": "K", "Ｌ": "L", "Ｍ": "M",
+        "Ｎ": "N", "Ｏ": "O", "Ｐ": "P", "Ｑ": "Q", "Ｒ": "R", "Ｓ": "S", "Ｔ": "T", "Ｕ": "U", "Ｖ": "V", "Ｗ": "W", "Ｘ": "X", "Ｙ": "Y", "Ｚ": "Z",
+        "ａ": "a", "ｂ": "b", "ｃ": "c", "ｄ": "d", "ｅ": "e", "ｆ": "f", "ｇ": "g", "ｈ": "h", "ｉ": "i", "ｊ": "j", "ｋ": "k", "ｌ": "l", "ｍ": "m",
+        "ｎ": "n", "ｏ": "o", "ｐ": "p", "ｑ": "q", "ｒ": "r", "ｓ": "s", "ｔ": "t", "ｕ": "u", "ｖ": "v", "ｗ": "w", "ｘ": "x", "ｙ": "y", "ｚ": "z",
+        "０": "0", "１": "1", "２": "2", "３": "3", "４": "4", "５": "5", "６": "6", "７": "7", "８": "8", "９": "9",
+        "！": "!", "＂": "\"", "＃": "#", "＄": "$", "％": "%", "＆": "&", "＇": "'", "（": "(", "）": ")", "＊": "*", "＋": "+", "，": ",", "－": "-", "．": ".", "／": "/", "：": ":",
+        "；": ";", "＜": "<", "＝": "=", "＞": ">", "？": "?", "＠": "@", "［": "[", "＼": "\\", "］": "]", "＾": "^", "＿": "_", "｀": "`", "｛": "{", "｜": "|", "｝": "}", "～": "~", "　": " "
+    }).reduce((text, [k, v]) => text.replace(new RegExp(k, "g"), v), data);
+}
+
+/**
+* Clean up text with `fixWidth()` and `trimExtend()`.
+* @example
+* ```ts
+* const text = "１  ＋  １  ＝  ２  ";
+* const formated = cleanText(text);
+* ```
+*/
+export function cleanText(data:string){
+    return trimExtend(fixWidth(data));
+}
+
 /**
 * Accurately recognize string that contain character above `0x010000` and array them one by character.
 * Useful for calculate number of characters with string contains emoji.

test/import.test.ts

@@ -0,0 +1,17 @@
+import {assertEquals} from "../deps.test.ts";
+import {importAssert} from "../src/import.ts";
+
+const expect = <const>{
+    assert: {
+        type: "json"
+    }
+};
+
+Deno.test({
+    name: "Import: Assert Option",
+    fn(){
+        const option = importAssert();
+
+        assertEquals(option, expect);
+    }
+});

test/log.deno.test.ts

@@ -1,13 +1,15 @@
 import {assertEquals, exists} from "../deps.test.ts";
 import {logEntry} from "../src/log.deno.ts";
 
+const name = "operation";
+
 Deno.test({
     name: "Log: Entry",
     async fn(){
-        const log = logEntry();
+        const log = logEntry(name);
         log.info("Lorem ipsum dolor sit amet.");
 
-        const result = await exists("./operation.log", {
+        const result = await exists(`./${name}.log`, {
             isFile: true
         });
 

test/path.deno.test.ts

@@ -1,32 +1,32 @@
 import {assertEquals, dirname, fromFileUrl} from "../deps.test.ts";
-import {slashUnix, slashWin, tmpPath, dataPath, homePath, mainPath} from "../src/path.deno.ts";
+import {slashU, slashW, tmpPath, dataPath, homePath, mainPath} from "../src/path.deno.ts";
 
 Deno.test({
     name: "Path: Separator",
-    async fn(){
+    fn(){
         const sampleUnix = "C:/Windows/System32/cmd.exe";
         const sampleWindows = "C:\\Windows\\System32\\cmd.exe";
 
-        assertEquals(slashUnix(sampleWindows), sampleUnix);
-        assertEquals(slashWin(sampleUnix), sampleWindows);
+        assertEquals(slashU(sampleWindows), sampleUnix);
+        assertEquals(slashW(sampleUnix), sampleWindows);
     }
 });
 
 Deno.test({
     ignore: Deno.build.os !== "windows",
     name: "Path: Windows",
-    async fn(){
+    fn(){
         assertEquals(tmpPath(), "C:/Windows/Temp");
         assertEquals(dataPath(), "C:/ProgramData");
-        assertEquals(homePath(), slashUnix(Deno.env.toObject().USERPROFILE));
-        assertEquals(mainPath(), slashUnix(fromFileUrl(dirname(Deno.mainModule))));
+        assertEquals(homePath(), slashU(Deno.env.toObject().USERPROFILE));
+        assertEquals(mainPath(), slashU(fromFileUrl(dirname(Deno.mainModule))));
     }
 });
 
 Deno.test({
     ignore: Deno.build.os === "windows",
     name: "Path: Unix",
-    async fn(){
+    fn(){
         assertEquals(tmpPath(), "/tmp");
         assertEquals(dataPath(), "/var");
         assertEquals(homePath(), Deno.env.toObject().HOME);

test/platform.deno.test.ts

@@ -4,15 +4,15 @@ import {isWin} from "../src/platform.deno.ts";
 Deno.test({
     ignore: Deno.build.os !== "windows",
     name: "Platform: Windows",
-    async fn(){
+    fn(){
         assertEquals(isWin(), true);
     }
 });
 
 Deno.test({
     ignore: Deno.build.os === "windows",
     name: "Platform: Posix",
-    async fn(){
+    fn(){
         assertEquals(isWin(), false);
     }
 });