From cb5f4048175da6c6a9f0ee11e3f91efc59b180fa Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Wed, 12 Jul 2023 04:34:15 -0400 Subject: [PATCH] fix: update import paths --- src/encoding/ascii.ts | 4 ++-- src/encoding/index.ts | 2 +- src/encoding/iso2022.ts | 4 ++-- src/encoding/mbcs.ts | 4 ++-- src/encoding/sbcs.ts | 4 ++-- src/encoding/unicode.ts | 4 ++-- src/encoding/utf8.ts | 4 ++-- src/index.ts | 36 +++++++++++++++++++++--------------- src/match.ts | 2 +- 9 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/encoding/ascii.ts b/src/encoding/ascii.ts index 4d23dc2..53fb7f2 100644 --- a/src/encoding/ascii.ts +++ b/src/encoding/ascii.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '.'; -import match, { Match } from '../match'; +import { Context, Recogniser } from './index.js'; +import match, { Match } from '../match.js'; export default class Ascii implements Recogniser { name() { diff --git a/src/encoding/index.ts b/src/encoding/index.ts index cad5221..b7f81d4 100644 --- a/src/encoding/index.ts +++ b/src/encoding/index.ts @@ -1,4 +1,4 @@ -import { Match } from '../match'; +import { Match } from '../match.js'; export interface Recogniser { match(input: Context): Match | null; diff --git a/src/encoding/iso2022.ts b/src/encoding/iso2022.ts index 598e283..46a918b 100644 --- a/src/encoding/iso2022.ts +++ b/src/encoding/iso2022.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '.'; -import match, { Match } from '../match'; +import { Context, Recogniser } from './index.js'; +import match, { Match } from '../match.js'; /** * This is a superclass for the individual detectors for diff --git a/src/encoding/mbcs.ts b/src/encoding/mbcs.ts index 4237537..999e56e 100644 --- a/src/encoding/mbcs.ts +++ b/src/encoding/mbcs.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '.'; -import match, { Match } from '../match'; +import { Context, Recogniser } from './index.js'; +import match, { Match } from '../match.js'; /** * Binary search implementation (recursive) diff --git a/src/encoding/sbcs.ts b/src/encoding/sbcs.ts index 83a42ad..6d37fc3 100644 --- a/src/encoding/sbcs.ts +++ b/src/encoding/sbcs.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '../encoding/index'; -import match, { Match } from '../match'; +import { Context, Recogniser } from '../encoding/index.js'; +import match, { Match } from '../match.js'; /** * This class recognizes single-byte encodings. Because the encoding scheme is so diff --git a/src/encoding/unicode.ts b/src/encoding/unicode.ts index 543001c..0ca0d05 100644 --- a/src/encoding/unicode.ts +++ b/src/encoding/unicode.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '.'; -import match, { Match } from '../match'; +import { Context, Recogniser } from './index.js'; +import match, { Match } from '../match.js'; /** * This class matches UTF-16 and UTF-32, both big- and little-endian. The diff --git a/src/encoding/utf8.ts b/src/encoding/utf8.ts index 6d3c0e4..584846f 100644 --- a/src/encoding/utf8.ts +++ b/src/encoding/utf8.ts @@ -1,5 +1,5 @@ -import { Context, Recogniser } from '.'; -import match, { Match } from '../match'; +import { Context, Recogniser } from './index.js'; +import match, { Match } from '../match.js'; export default class Utf8 implements Recogniser { name() { diff --git a/src/index.ts b/src/index.ts index 487afa1..5b8f374 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,21 +1,21 @@ -import { Match } from './match'; -import { Recogniser, Context } from './encoding'; +import { Match } from './match.js'; +import { Recogniser, Context } from './encoding/index.js'; -import loadFs from './fs/node'; +import loadFs from './fs/node.js'; -import Ascii from './encoding/ascii'; -import Utf8 from './encoding/utf8'; -import * as unicode from './encoding/unicode'; -import * as mbcs from './encoding/mbcs'; -import * as sbcs from './encoding/sbcs'; -import * as iso2022 from './encoding/iso2022'; +import Ascii from './encoding/ascii.js'; +import Utf8 from './encoding/utf8.js'; +import * as unicode from './encoding/unicode.js'; +import * as mbcs from './encoding/mbcs.js'; +import * as sbcs from './encoding/sbcs.js'; +import * as iso2022 from './encoding/iso2022.js'; interface FullOptions { - sampleSize: number, - offset: number + sampleSize: number; + offset: number; } -export type Options = Partial +export type Options = Partial; const recognisers: Recogniser[] = [ new Utf8(), @@ -88,9 +88,12 @@ export const analyse = (buffer: Uint8Array): AnalyseResult => { }); return matches as Match[]; -} +}; -export const detectFile = (filepath: string, opts: Options = {}): Promise => +export const detectFile = ( + filepath: string, + opts: Options = {} +): Promise => new Promise((resolve, reject) => { let fd: any; const fs = loadFs(); @@ -120,7 +123,10 @@ export const detectFile = (filepath: string, opts: Options = {}): Promise { +export const detectFileSync = ( + filepath: string, + opts: Options = {} +): DetectResult => { const fs = loadFs(); if (opts && opts.sampleSize) { diff --git a/src/match.ts b/src/match.ts index 00c262c..7e7258d 100644 --- a/src/match.ts +++ b/src/match.ts @@ -1,4 +1,4 @@ -import { Context, Recogniser } from "./encoding"; +import { Context, Recogniser } from './encoding/index.js'; export interface Match { confidence: number;