Fix import and support tree shaking (#23)

* Fix import and support tree shaking

* Fix test

* Fix build

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Build for type check
         run: |
-          yarn build --noEmit
+          yarn build
 
   test:
     runs-on: ubuntu-latest

.gitignore

@@ -13,3 +13,4 @@
 lib/
 coverage/
 node_modules/
+package.tgz

packages/time/.gitignore

@@ -0,0 +1,2 @@
+/*.*js
+/*.d.ts

packages/time/README.md

@@ -19,6 +19,14 @@ await Promise.all([
 ])
 ```
 
+## delay
+```ts
+import { delay } from '@kanziw/time'
+
+// It takes about 100ms
+await delay(100)
+```
+
 ## stopwatch
 
 Measure elapsed ms using perf_hooks.performance

packages/time/package.json

@@ -1,15 +1,12 @@
 {
   "name": "@kanziw/time",
-  "version": "0.2.3",
+  "version": "0.3.3",
   "description": "A collection of utility libraries about time",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kanziw/kanziwjs.git",
     "directory": "packages/time"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "homepage": "https://github.com/kanziw/kanziwjs/tree/main/packages/time#readme",
   "keywords": [
     "time",
@@ -24,13 +21,53 @@
     "name": "Jiwoong Jung",
     "email": "kanziwoong@gmail.com"
   },
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
+  "exports": {
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public",
+    "type": "commonjs",
+    "main": "./index.js",
+    "types": "./index.d.ts",
+    "exports": {
+      ".": {
+        "types": "./index.d.ts",
+        "import": "./index.js",
+        "require": "./index.cjs"
+      },
+      "./cancellableDelay": {
+        "types": "./cancellableDelay.d.ts",
+        "import": "./cancellableDelay.js",
+        "require": "./cancellableDelay.cjs"
+      },
+      "./delay": {
+        "types": "./delay.d.ts",
+        "import": "./delay.js",
+        "require": "./delay.cjs"
+      },
+      "./stopwatch": {
+        "types": "./stopwatch.d.ts",
+        "import": "./stopwatch.js",
+        "require": "./stopwatch.cjs"
+      },
+      "./timezone": {
+        "types": "./timezone.d.ts",
+        "import": "./timezone.js",
+        "require": "./timezone.cjs"
+      },
+      "./package.json": "./package.json"
+    }
+  },
+  "files": [
+    "/*.d.ts",
+    "/*.*js"
+  ],
   "scripts": {
     "test": "yarn workspace kanziwjs test packages/time",
-    "clean": "rimraf lib",
-    "build": "yarn clean && yarn tsc",
-    "publish": "yarn build && yarn publish-if-not-published"
+    "prepack": "yarn build",
+    "build": "node scripts/build-exports.js && tsc -p tsconfig.build.json",
+    "publish": "yarn build && yarn publish-if-not-published",
+    "publish:rc": "yarn build && yarn publish-if-not-published --no-tag-check -- --tag rc"
   },
   "devDependencies": {
     "@types/jest": "^29.5.11",

packages/time/scripts/build-exports.js

@@ -0,0 +1,46 @@
+const fs = require('fs')
+const path = require('path')
+const { build } = require('esbuild')
+
+const rootDir = path.join(__dirname, '..')
+const srcDir = path.join(rootDir, 'src')
+const distDir = path.join(rootDir, '')
+
+try {
+  fs.rmSync(path.join(distDir, '*.d.ts'), { recursive: true })
+  fs.rmSync(path.join(distDir, '*.*js'), { recursive: true })
+} catch {}
+
+const src = (name) => path.join(srcDir, name)
+const modules = fs.readdirSync(srcDir).filter((name) => name !== '__tests__')
+
+/**
+ * @param {string} content
+ */
+function rewriteCjsEntries(content) {
+  return content.replace(/(require\("(?<id>.*)\.js"\))/g, (_match, _group1, id) => {
+    return `require("${id}.cjs")`
+  })
+}
+;(async () => {
+  const entryPoints = modules.map(src)
+  await build({
+    entryPoints,
+    outdir: distDir,
+    outExtension: { '.js': '.js' },
+    format: 'esm',
+    treeShaking: true,
+    write: true,
+  })
+  const { outputFiles: cjsOutputFiles = [] } = await build({
+    entryPoints,
+    outdir: distDir,
+    outExtension: { '.js': '.cjs' },
+    format: 'cjs',
+    treeShaking: true,
+    write: false,
+  })
+  for (const file of cjsOutputFiles) {
+    fs.writeFileSync(file.path, rewriteCjsEntries(file.text), 'utf8')
+  }
+})()

packages/time/src/__tests__/cancellableDelay.spec.ts

@@ -1,5 +1,5 @@
-import { cancellableDelay } from '../cancellableDelay'
-import { startStopwatch } from '../stopwatch'
+import cancellableDelay from '../cancellableDelay'
+import startStopwatch from '../stopwatch'
 
 describe('cancellableDelay', () => {
   test('delay', async () => {

packages/time/src/__tests__/stopwatch.spec.ts

@@ -1,6 +1,5 @@
-import { setTimeout as delay } from 'timers/promises'
-
-import { startStopwatch } from '../stopwatch'
+import delay from '../delay'
+import startStopwatch from '../stopwatch'
 
 describe('startStopwatch', () => {
   test('end', async () => {

packages/time/src/cancellableDelay.ts

@@ -6,7 +6,7 @@ type CancellabledDelay<T> = {
   promise: Promise<T>
 }
 
-export const cancellableDelay = <T>(ms: number, value?: T): CancellabledDelay<Maybe<T>> => {
+const cancellableDelay = <T>(ms: number, value?: T): CancellabledDelay<Maybe<T>> => {
   /* istanbul ignore next line */
   const ret: CancellabledDelay<Maybe<T>> = {
     cancel: () => undefined,
@@ -31,3 +31,5 @@ export const cancellableDelay = <T>(ms: number, value?: T): CancellabledDelay<Ma
 
   return ret
 }
+
+export default cancellableDelay

packages/time/src/delay.ts

@@ -0,0 +1,3 @@
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+export default delay

packages/time/src/index.ts

@@ -1,3 +1,4 @@
-export * from './cancellableDelay'
-export * from './stopwatch'
+export { default as cancellableDelay } from './cancellableDelay'
+export { default as delay } from './delay'
+export { default as startStopwatch } from './stopwatch'
 export * from './timezone'

packages/time/src/stopwatch.ts

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks'
 
-export const startStopwatch = () => {
+const startStopwatch = () => {
   const start = performance.now()
 
   return {
@@ -9,3 +9,5 @@ export const startStopwatch = () => {
     },
   }
 }
+
+export default startStopwatch

packages/time/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["src/__tests__"]
+}

packages/time/tsconfig.json

@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib",
+    "outDir": "",
+    "declaration": true,
+    "emitDeclarationOnly": true
   },
   "include": ["src"]
 }