feat: move to pure esm

DimensionDev · Oct 9, 2022 · ef5dfa0 · ef5dfa0
1 parent f3cdc50
commit ef5dfa0
Show file tree

Hide file tree

Showing 27 changed files with 168 additions and 138 deletions.
diff --git a/package.json b/package.json
@@ -2,20 +2,21 @@
   "name": "@dimensiondev/stego-js",
   "version": "0.13.0",
   "packageManager": "[email protected]",
+  "type": "module",
   "description": "Steganography, based on frequency domain implemented in JavaScript.",
   "repository": "https://github.com/DimensionDev/Stego-JS",
   "license": "MIT",
   "author": "DimensionDev",
-  "main": "./cjs/node.js",
+  "main": "./esm/node.js",
   "module": "./esm/node.js",
-  "browser": "./cjs/dom.js",
-  "bin": "./cjs/cli/cli.js",
+  "browser": "./esm/dom.js",
+  "bin": "./esm/cli/cli.js",
   "scripts": {
     "prebuild": "pnpm run clean",
     "build": "pnpm run build:umd && pnpm run build:dist",
-    "build:dist": "tsc && tsc -p tsconfig.esm.json",
+    "build:dist": "tsc",
     "build:umd": "rollup -c",
-    "clean": "rimraf umd cjs esm",
+    "clean": "rimraf umd esm",
     "lint": "eslint . --ext .ts,.tsx",
     "prepublishOnly": "pnpm run build",
     "test": "vitest"

diff --git a/src/cli/cli.ts b/src/cli/cli.ts
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import meow from 'meow'
 import { createReadStream } from 'fs'
-import { rs2Buf } from '../utils/helper'
-import { encode, decode, AlgorithmVersion } from '../node'
+import { rs2Buf } from '../utils/helper.js'
+import { encode, decode, AlgorithmVersion } from '../node.js'
 import {
   CLI_NAME,
   DEFAULT_COPIES,
@@ -13,8 +13,8 @@ import {
   DEFAULT_EXHAUST_PIXELS,
   DEFAULT_FAKE_MASK_PIXELS,
   DEFAULT_ALGORITHM_VERSION,
-} from '../constant'
-import { normalizeFlags, validateFlags, flags2Options, flags } from './flag'
+} from '../constant.js'
+import { normalizeFlags, validateFlags, flags2Options, flags } from './flag.js'
 
 const cli = meow(
   `Usage
@@ -23,7 +23,7 @@ const cli = meow(
 Options
   -h, --help             Print help message.
   -v, --version          Print version message.
-  
+
   -e, --encode           Encode message into given image.
   -d, --decode           Decode message from given image.
 
@@ -57,6 +57,7 @@ Examples
   {
     flags,
     inferType: true,
+    importMeta: import.meta,
   },
 )
 

diff --git a/src/cli/flag.ts b/src/cli/flag.ts
@@ -1,7 +1,7 @@
 import { resolve as resolvePath } from 'path'
-import { EncodeOptions, DecodeOptions, AlgorithmVersion } from '../utils/stego-params'
-import { GrayscaleAlgorithm } from '../utils/grayscale'
-import { TransformAlgorithm } from '../utils/transform'
+import { EncodeOptions, DecodeOptions, AlgorithmVersion } from '../utils/stego-params.js'
+import { GrayscaleAlgorithm } from '../utils/grayscale.js'
+import { TransformAlgorithm } from '../utils/transform.js'
 import {
   DEFAULT_ALGORITHM_VERSION,
   DEFAULT_COPIES,
@@ -13,7 +13,7 @@ import {
   TOLERANCE_NOT_SET,
   DEFAULT_TOLERANCE,
   MAX_TOLERANCE,
-} from '../constant'
+} from '../constant.js'
 import { TypedFlags } from 'meow'
 
 export interface Flags {

diff --git a/src/constant.ts b/src/constant.ts
@@ -1,5 +1,5 @@
-import { TransformAlgorithm } from './utils/transform'
-import { AlgorithmVersion } from './utils/stego-params'
+import { TransformAlgorithm } from './utils/transform.js'
+import { AlgorithmVersion } from './utils/stego-params.js'
 
 export const CLI_NAME = 'stego-js'
 
@@ -36,12 +36,10 @@ export const DEFAULT_CROP_EDGE_PIXELS = true
 export const DEFAULT_ALGORITHM_VERSION = AlgorithmVersion.V2
 
 export const DEFAULT_MASK = [
-  0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0,
-  0x0, 0x1, 0x1, 0x3, 0x0, 0x0, 0x0, 0x25, 0xdb, 0x56, 0xca, 0x0, 0x0, 0x0, 0x1, 0x73, 0x52, 0x47, 0x42, 0x1, 0xd9,
-  0xc9, 0x2c, 0x7f, 0x0, 0x0, 0x0, 0x9, 0x70, 0x48, 0x59, 0x73, 0x0, 0x0, 0xb, 0x13, 0x0, 0x0, 0xb, 0x13, 0x1, 0x0,
-  0x9a, 0x9c, 0x18, 0x0, 0x0, 0x0, 0x3, 0x50, 0x4c, 0x54, 0x45, 0xff, 0xff, 0xff, 0xa7, 0xc4, 0x1b, 0xc8, 0x0, 0x0, 0x0,
-  0xa, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x60, 0x0, 0x0, 0x0, 0x2, 0x0, 0x1, 0x48, 0xaf, 0xa4, 0x71, 0x0, 0x0,
-  0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+  137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 1, 3, 0, 0, 0, 37, 219, 86, 202,
+  0, 0, 0, 1, 115, 82, 71, 66, 1, 217, 201, 44, 127, 0, 0, 0, 9, 112, 72, 89, 115, 0, 0, 11, 19, 0, 0, 11, 19, 1, 0,
+  154, 156, 24, 0, 0, 0, 3, 80, 76, 84, 69, 255, 255, 255, 167, 196, 27, 200, 0, 0, 0, 10, 73, 68, 65, 84, 120, 156, 99,
+  96, 0, 0, 0, 2, 0, 1, 72, 175, 164, 113, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130,
 ]
 
 export const SEED = [

diff --git a/src/dom.ts b/src/dom.ts
@@ -1,13 +1,13 @@
-import { proxy } from './utils/expose'
-import { imgType } from './utils/helper'
-import { preprocessImage } from './utils/image'
-import { AlgorithmVersion } from './utils/stego-params'
-import * as v1 from './v1'
-import * as v2 from './v2'
+import { proxy } from './utils/expose.js'
+import { imgType } from './utils/helper.js'
+import { preprocessImage } from './utils/image.js'
+import { AlgorithmVersion } from './utils/stego-params.js'
+import * as v1 from './v1/index.js'
+import * as v2 from './v2/index.js'
 
 export { imgType as getImageType }
-export * from './utils/types'
-export * from './constant'
+export * from './utils/types.js'
+export * from './constant.js'
 
 const { encode, decode } = proxy({
   algoithms: { [AlgorithmVersion.V1]: v1, [AlgorithmVersion.V2]: v2 },

diff --git a/src/node.ts b/src/node.ts
@@ -1,14 +1,14 @@
 import { JsColorType, Transformer } from '@napi-rs/image'
-import { proxy } from './utils/expose'
-import { imgType } from './utils/helper'
-import { preprocessImage } from './utils/image'
-import { AlgorithmVersion } from './utils/stego-params'
-import * as v1 from './v1'
-import * as v2 from './v2'
+import { proxy } from './utils/expose.js'
+import { imgType } from './utils/helper.js'
+import { preprocessImage } from './utils/image.js'
+import { AlgorithmVersion } from './utils/stego-params.js'
+import * as v1 from './v1/index.js'
+import * as v2 from './v2/index.js'
 
 export { imgType as getImageType }
-export * from './utils/types'
-export * from './constant'
+export * from './utils/types.js'
+export * from './constant.js'
 
 const { encode, decode } = proxy({
   algoithms: { [AlgorithmVersion.V1]: v1, [AlgorithmVersion.V2]: v2 },

diff --git a/src/utils/expose.ts b/src/utils/expose.ts
@@ -1,4 +1,4 @@
-import { AlgorithmVersion, DecodeOptions, EncodeOptions } from './stego-params'
+import { AlgorithmVersion, DecodeOptions, EncodeOptions } from './stego-params.js'
 
 export interface EncodedImageData {
   data: ImageData
@@ -16,7 +16,13 @@ export interface Methods {
 }
 
 interface ProxyOptions {
-  algoithms: Record<AlgorithmVersion, { encode: Encoder; decode: Decoder }>
+  algoithms: Record<
+    AlgorithmVersion,
+    {
+      encode: Encoder
+      decode: Decoder
+    }
+  >
   methods: Methods
 }
 

diff --git a/src/utils/grayscale.ts b/src/utils/grayscale.ts
@@ -1,4 +1,4 @@
-import { clamp } from './helper'
+import { clamp } from './helper.js'
 
 // more grayscale algorithm:
 // http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/

diff --git a/src/utils/image.ts b/src/utils/image.ts
@@ -1,10 +1,10 @@
-import { clamp } from './helper'
-import { Options } from './stego-params'
-import { Locator, loc2idx, loc2coord } from './locator'
+import { clamp } from './helper.js'
+import { Options } from './stego-params.js'
+import { Locator, loc2idx, loc2coord } from './locator.js'
 import { lanczos } from '@rgba-image/lanczos'
-import { MAX_WIDTH } from '../constant'
+import { MAX_WIDTH } from '../constant.js'
 
-import { transform } from '../utils/transform'
+import { transform } from '../utils/transform.js'
 
 export type Pixel = [number, number, number, number]
 
@@ -121,7 +121,6 @@ export function updateImgByPixelChannelAt(imgData: ImageData, loc: number, chann
 
 export function updateImgByPixelAt(imgData: ImageData, options: Options, pixel: Pixel, loc: number) {
   const { data } = imgData
-
   ;[data[loc], data[loc + 1], data[loc + 2], data[loc + 3]] = pixel
 }
 

diff --git a/src/utils/locator.ts b/src/utils/locator.ts
@@ -1,4 +1,4 @@
-import { Options } from './stego-params'
+import { Options } from './stego-params.js'
 
 export interface Locator {
   /**

diff --git a/src/utils/mask.ts b/src/utils/mask.ts
@@ -1,5 +1,5 @@
-import { Options } from './stego-params'
-import { Locator, loc2idx, loc2coord } from './locator'
+import { Options } from './stego-params.js'
+import { Locator, loc2idx, loc2coord } from './locator.js'
 
 export function isBlockVisibleAt({ data }: ImageData, loc: Locator, options: Options) {
   const { size } = options

diff --git a/src/utils/stego-params.ts b/src/utils/stego-params.ts
@@ -1,5 +1,5 @@
-import { GrayscaleAlgorithm } from './grayscale'
-import { TransformAlgorithm } from './transform'
+import { GrayscaleAlgorithm } from './grayscale.js'
+import { TransformAlgorithm } from './transform.js'
 
 export enum AlgorithmVersion {
   V1 = 'V1',

diff --git a/src/utils/transform.ts b/src/utils/transform.ts
@@ -1,7 +1,7 @@
 import FFT from '../fft/index.js'
-import * as DCT from '../dct'
-import { fastDctLee } from '../dct/fastdct'
-import { Options } from './stego-params'
+import * as DCT from '../dct/index.js'
+import { fastDctLee } from '../dct/fastdct.js'
+import { Options } from './stego-params.js'
 
 export enum TransformAlgorithm {
   FFT1D = 'FFT1D',

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -1,4 +1,4 @@
-export type { Decoder, Encoder, EncodedImageData } from './expose'
-export { type EncodeOptions, type DecodeOptions, AlgorithmVersion } from './stego-params'
-export { GrayscaleAlgorithm } from './grayscale'
-export { TransformAlgorithm } from './transform'
+export type { Decoder, Encoder, EncodedImageData } from './expose.js'
+export { type EncodeOptions, type DecodeOptions, AlgorithmVersion } from './stego-params.js'
+export { GrayscaleAlgorithm } from './grayscale.js'
+export { TransformAlgorithm } from './transform.js'
diff --git a/src/v1/bit.ts b/src/v1/bit.ts
@@ -1,6 +1,6 @@
-import { Options } from '../utils/stego-params'
-import { getPos, Accumulator } from './position'
-import { Locator } from '../utils/locator'
+import { Options } from '../utils/stego-params.js'
+import { getPos, Accumulator } from './position.js'
+import { Locator } from '../utils/locator.js'
 
 export type Bit = 0 | 1
 

diff --git a/src/v1/index.ts b/src/v1/index.ts
@@ -1,8 +1,8 @@
-import { EncodeOptions } from '../utils/stego-params'
-import { encodeImg } from './stego'
-import { cropImg } from '../utils/image'
+import { EncodeOptions } from '../utils/stego-params.js'
+import { encodeImg } from './stego.js'
+import { cropImg } from '../utils/image.js'
 
-export { decodeImg as decode } from './stego'
+export { decodeImg as decode } from './stego.js'
 
 export async function encode(imgData: ImageData, maskData: ImageData, options: EncodeOptions) {
   const { width, height } = imgData

diff --git a/src/v1/position.ts b/src/v1/position.ts
@@ -1,7 +1,7 @@
-import { Options } from '../utils/stego-params'
-import { TransformAlgorithm } from '../utils/transform'
-import { hashCode, squareCircleIntersect } from '../utils/helper'
-import { Locator } from '../utils/locator'
+import { Options } from '../utils/stego-params.js'
+import { TransformAlgorithm } from '../utils/transform.js'
+import { hashCode, squareCircleIntersect } from '../utils/helper.js'
+import { Locator } from '../utils/locator.js'
 
 export interface Accumulator {
   /**

diff --git a/src/v1/stego.ts b/src/v1/stego.ts
@@ -1,12 +1,12 @@
-import { GrayscaleAlgorithm, grayscale, narrow } from '../utils/grayscale'
-import { transform, inverseTransform } from '../utils/transform'
-import { cropImg, updateImgByBlock, updateImgByPixel, visitImgByBlock, updateImgByPixelAt } from '../utils/image'
-import { mergeBits, createBits, str2bits, setBit, getBit, bits2str, Bit } from './bit'
-import { createAcc } from './position'
-import { isPixelVisibleAt, isBlockVisibleAt } from '../utils/mask'
-import { rand } from '../utils/helper'
-import { loc2idx, loc2coord } from '../utils/locator'
-import { EncodeOptions, DecodeOptions } from '../utils/stego-params'
+import { GrayscaleAlgorithm, grayscale, narrow } from '../utils/grayscale.js'
+import { transform, inverseTransform } from '../utils/transform.js'
+import { cropImg, updateImgByBlock, updateImgByPixel, visitImgByBlock, updateImgByPixelAt } from '../utils/image.js'
+import { mergeBits, createBits, str2bits, setBit, getBit, bits2str, Bit } from './bit.js'
+import { createAcc } from './position.js'
+import { isPixelVisibleAt, isBlockVisibleAt } from '../utils/mask.js'
+import { rand } from '../utils/helper.js'
+import { loc2idx, loc2coord } from '../utils/locator.js'
+import { EncodeOptions, DecodeOptions } from '../utils/stego-params.js'
 
 export async function encodeImg(imgData: ImageData, maskData: ImageData, options: EncodeOptions) {
   const { text, size, narrow: narrowSize, copies, grayscaleAlgorithm, transformAlgorithm, exhaustPixels } = options
@@ -16,7 +16,7 @@ export async function encodeImg(imgData: ImageData, maskData: ImageData, options
   const bits = mergeBits(
     createBits(exhaustPixels ? sizeOfBlocks : textBits.length + 8 * copies),
     textBits,
-    createBits(8 * copies).fill(1), // the end of message
+    createBits(8 * copies).fill(1),
   )
 
   if (textBits.length + 8 * copies > sizeOfBlocks) {