Skip to content

Commit fbd3979

Browse files
dojyorindojyorin
authored
jsr support. (#106)
* jsr support. * change name * sheet. * code format. * code format.
1 parent 4e752b9 commit fbd3979

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+215
-415
lines changed

‎deps.pure.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
// @deno-types="https://deno.land/[email protected]/csv/mod.ts"
2-
export {parse, stringify} from "https://esm.sh/gh/denoland/[email protected]/csv/mod.ts?bundle&target=esnext";
3-
// @deno-types="https://deno.land/x/[email protected]/index.d.ts"
4-
export {ZipReader, ZipWriter, Uint8ArrayReader, Uint8ArrayWriter} from "https://esm.sh/gh/gildas-lormeau/[email protected]/index.js?bundle&target=esnext";
1+
export {parse, stringify} from "https://esm.sh/jsr/@std/[email protected]?bundle&target=esnext";
2+
export {ZipReader, ZipWriter, Uint8ArrayReader, Uint8ArrayWriter} from "https://esm.sh/jsr/@zip-js/[email protected]?bundle&target=esnext";
53

64
// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.2/package/types/index.d.ts"
7-
export {type WorkBook as RawWorkBook, type WorkSheet as RawWorkSheet, type CellObject as RawWorkCell, set_cptable, read as xlsxRead, write as xlsxWrite, utils as xlsxUtil} from "https://cdn.sheetjs.com/xlsx-0.20.2/package/xlsx.mjs";
8-
export * as xlsxcp from "https://cdn.sheetjs.com/xlsx-0.20.2/package/dist/cpexcel.full.mjs";
5+
export {type WorkBook as RawWorkBook, type WorkSheet as RawWorkSheet, type CellObject as RawWorkCell, set_cptable, read as sheetRead, write as sheetWrite, utils as sheetUtil} from "https://cdn.sheetjs.com/xlsx-0.20.2/package/xlsx.mjs";
6+
export * as excelcp from "https://cdn.sheetjs.com/xlsx-0.20.2/package/dist/cpexcel.full.mjs";

‎deps.test.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
export {assertEquals} from "https://deno.land/[email protected]/assert/mod.ts";
2-
export {dirname, fromFileUrl} from "https://deno.land/[email protected]/path/mod.ts";
3-
export {exists} from "https://deno.land/[email protected]/fs/mod.ts";
4-
export {delay} from "https://deno.land/[email protected]/async/mod.ts";
5-
6-
export {DOMParser} from "https://deno.land/x/[email protected]/deno-dom-wasm.ts";
1+
export {assertEquals} from "jsr:@std/[email protected]";
2+
export {dirname, fromFileUrl} from "jsr:@std/[email protected]";
3+
export {exists} from "jsr:@std/[email protected]";
4+
export {delay} from "jsr:@std/[email protected]";
5+
export {DOMParser} from "jsr:@b-fuze/[email protected]";
76

87
export {init as smtpTest} from "npm:[email protected]";

‎deps.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
export {Logger, ConsoleHandler, FileHandler} from "https://deno.land/[email protected]/log/mod.ts";
2-
export {format} from "https://deno.land/[email protected]/datetime/mod.ts";
3-
4-
export {type Element, DOMParser} from "https://deno.land/x/[email protected]/deno-dom-wasm.ts";
1+
export {Logger, ConsoleHandler, FileHandler} from "jsr:@std/[email protected]";
2+
export {format} from "jsr:@std/[email protected]";
3+
export {type Element, DOMParser} from "jsr:@b-fuze/[email protected]";
54

65
// @deno-types="npm:@types/[email protected]"
76
export {createTransport} from "npm:[email protected]";

‎mod.full.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
export * from "./mod.pure.full.ts";
22

33
export * from "./src/deno/json.ts";
4-
export * from "./src/deno/os.ts";
5-
export * from "./src/deno/path.ts";
64
export * from "./src/deno/process.ts";
75

86
export * from "./src/deno_ext/dom.ts";

‎mod.pure.full.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from "./mod.pure.ts";
22

33
export * from "./src/pure_ext/csv.ts";
4-
export * from "./src/pure_ext/excel.ts";
4+
export * from "./src/pure_ext/sheet.ts";
55
export * from "./src/pure_ext/zip.ts";

‎mod.test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import "./test/pure/time.test.ts";
1212
import "./test/pure/worker.test.ts";
1313

1414
import "./test/pure_ext/csv.test.ts";
15-
import "./test/pure_ext/excel.test.ts";
15+
import "./test/pure_ext/sheet.test.ts";
1616
import "./test/pure_ext/zip.test.ts";
1717

1818
import "./test/deno/json.test.ts";
19-
import "./test/deno/os.test.ts";
20-
import "./test/deno/path.test.ts";
2119
import "./test/deno/process.test.ts";
2220

2321
import "./test/deno_ext/dom.test.ts";

‎mod.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
export * from "./mod.pure.ts";
22

33
export * from "./src/deno/json.ts";
4-
export * from "./src/deno/os.ts";
5-
export * from "./src/deno/path.ts";
64
export * from "./src/deno/process.ts";

‎src/deno/json.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {type Opt} from "../pure/deep.ts";
77
* const json = await jsonRead("./data.json");
88
* ```
99
*/
10-
export async function jsonRead<T extends Opt<T>>(path:string):Promise<T>{
10+
export async function jsonRead<T extends Opt<T>>(path: string): Promise<T> {
1111
return JSON.parse(await Deno.readTextFile(path));
1212
}
1313

@@ -20,7 +20,7 @@ export async function jsonRead<T extends Opt<T>>(path:string):Promise<T>{
2020
* });
2121
* ```
2222
*/
23-
export async function jsonWrite<T extends Opt<T>>(path:string, data:T):Promise<void>{
23+
export async function jsonWrite<T extends Opt<T>>(path: string, data: T): Promise<void> {
2424
await Deno.writeTextFile(path, JSON.stringify(data, undefined, 4));
2525
}
2626

@@ -34,15 +34,13 @@ export async function jsonWrite<T extends Opt<T>>(path:string, data:T):Promise<v
3434
* const json = await jsonLoad("./data.json", data);
3535
* ```
3636
*/
37-
export async function jsonLoad<T extends Opt<T>>(path:string, def:T):Promise<T>{
38-
try{
37+
export async function jsonLoad<T extends Opt<T>>(path: string, def: T): Promise<T> {
38+
try {
3939
return await jsonRead<T>(path);
40-
}
41-
catch(e){
42-
if(e instanceof Deno.errors.NotFound){
40+
} catch(e) {
41+
if(e instanceof Deno.errors.NotFound) {
4342
await jsonWrite(path, def);
44-
}
45-
else{
43+
} else {
4644
throw e;
4745
}
4846
}

‎src/deno/os.ts

-26
This file was deleted.

‎src/deno/path.ts

-88
This file was deleted.

‎src/deno/process.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* const success = await processRun("echo", "foobar");
66
* ```
77
*/
8-
export async function processRun(...commands:string[]):Promise<boolean>{
8+
export async function processRun(...commands: string[]): Promise<boolean> {
99
const {success} = await new Deno.Command(commands.shift() ?? "", {
1010
args: commands,
1111
stdin: "null",

‎src/deno_ext/dom.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {type Element, DOMParser} from "../../deps.ts";
22

3-
function selectedElement(elements:Element[], attribute:"checked" | "selected"){
3+
function selectedElement(elements: Element[], attribute: "checked" | "selected") {
44
return elements.find(v => typeof v.getAttribute(attribute) === "string");
55
}
66

7-
function getValue(element?:Element){
7+
function getValue(element?: Element) {
88
return element?.getAttribute("value") ?? "";
99
}
1010

11-
function extractValue(element?:Element){
12-
switch(element?.tagName){
11+
function extractValue(element?: Element) {
12+
switch(element?.tagName) {
1313
case "SELECT": return getValue(selectedElement(element.getElementsByTagName("option"), "selected"));
1414
case "DATALIST": return getValue(selectedElement(element.getElementsByTagName("option"), "selected"));
1515
case "OPTION": return getValue(element);
@@ -27,10 +27,10 @@ function extractValue(element?:Element){
2727
* const dom = domDecode("<div>foo</div>");
2828
* ```
2929
*/
30-
export function domDecode(html:string):Element{
30+
export function domDecode(html: string): Element {
3131
const element = new DOMParser().parseFromString(html, "text/html")?.documentElement;
3232

33-
if(!element){
33+
if(!element) {
3434
throw new Error();
3535
}
3636

@@ -45,19 +45,19 @@ export function domDecode(html:string):Element{
4545
* const result = domValuesPerId(dom);
4646
* ```
4747
*/
48-
export function domValuesPerId(element:Element):Record<string, string>{
49-
const records:Record<string, string> = {};
48+
export function domValuesPerId(element: Element): Record<string, string> {
49+
const records: Record<string, string> = {};
5050

51-
for(const input of element.getElementsByTagName("INPUT")){
52-
if(!input.id){
51+
for(const input of element.getElementsByTagName("INPUT")) {
52+
if(!input.id) {
5353
continue;
5454
}
5555

5656
records[input.id] = getValue(input);
5757
}
5858

59-
for(const textarea of element.getElementsByTagName("TEXTAREA")){
60-
if(!textarea.id){
59+
for(const textarea of element.getElementsByTagName("TEXTAREA")) {
60+
if(!textarea.id) {
6161
continue;
6262
}
6363

@@ -76,7 +76,7 @@ export function domValuesPerId(element:Element):Record<string, string>{
7676
* const result = domValueById(dom, "foo");
7777
* ```
7878
*/
79-
export function domValueById(element:Element, id:string):string{
79+
export function domValueById(element: Element, id: string): string {
8080
return extractValue(element.getElementById(id) ?? undefined);
8181
}
8282

@@ -88,7 +88,7 @@ export function domValueById(element:Element, id:string):string{
8888
* const result = domElementsByName(dom, "foo");
8989
* ```
9090
*/
91-
export function domElementsByName(element:Element, name:string):Element[]{
91+
export function domElementsByName(element: Element, name: string): Element[] {
9292
return element.getElementsByTagName("*").filter(v => v.getAttribute("name") === name);
9393
}
9494

@@ -101,7 +101,7 @@ export function domElementsByName(element:Element, name:string):Element[]{
101101
* const result = domValuesByName(dom, "foo");
102102
* ```
103103
*/
104-
export function domValuesByName(element:Element, name:string):string[]{
104+
export function domValuesByName(element: Element, name: string): string[] {
105105
return domElementsByName(element, name).map(v => extractValue(v));
106106
}
107107

@@ -113,10 +113,10 @@ export function domValuesByName(element:Element, name:string):string[]{
113113
* const result = domValueByRadioActive(dom, "foo");
114114
* ```
115115
*/
116-
export function domValueByRadioActive(element:Element, name:string):string{
116+
export function domValueByRadioActive(element: Element, name: string): string {
117117
const elements = domElementsByName(element, name);
118118

119-
if(elements.some(v => v.tagName !== "INPUT" || v.getAttribute("type") !== "radio")){
119+
if(elements.some(v => v.tagName !== "INPUT" || v.getAttribute("type") !== "radio")) {
120120
return "";
121121
}
122122

‎src/deno_ext/log.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Logger, ConsoleHandler, FileHandler, format} from "../../deps.ts";
22

3-
function logRecord(date:Date, level:string, message:string){
3+
function logRecord(date: Date, level: string, message: string) {
44
return `${format(date, "yyyy-MM-ddTHH:mm:ss")} [${level}] ${message}`;
55
}
66

@@ -13,31 +13,31 @@ function logRecord(date:Date, level:string, message:string){
1313
* const log = logEntry();
1414
* ```
1515
*/
16-
export function logEntry(name?:string, path?:string):Logger{
16+
export function logEntry(name?: string, path?: string): Logger {
1717
const level = "INFO";
1818

1919
const log = new Logger(name ?? "log", level, {
2020
handlers: [
2121
new ConsoleHandler(level, {
22-
formatter({datetime, levelName, msg}){
22+
formatter({datetime, levelName, msg}) {
2323
return logRecord(datetime, levelName, msg);
2424
}
2525
})
2626
]
2727
});
2828

29-
if(path){
29+
if(path) {
3030
log.handlers.push(
3131
new FileHandler(level, {
3232
filename: path,
33-
formatter({datetime, levelName, msg}){
33+
formatter({datetime, levelName, msg}) {
3434
return logRecord(datetime, levelName, msg);
3535
}
3636
})
3737
);
3838
}
3939

40-
for(const h of log.handlers){
40+
for(const h of log.handlers) {
4141
h.setup();
4242
}
4343

0 commit comments

Comments
 (0)