Revision 0.32.0

hammer.mjs

@@ -1,4 +1,5 @@
-import { compression, measurement } from './task/benchmark'
+import * as Benchmark from './task/benchmark'
+import * as Build from './task/build'
 import * as Fs from 'fs'
 
 // -------------------------------------------------------------------------------
@@ -18,20 +19,14 @@ export async function format() {
 // Start
 // -------------------------------------------------------------------------------
 export async function start() {
-  await shell(`hammer run example/index.ts --dist target/example`)
+  await shell(`hammer run example/index.mts --dist target/example`)
 }
 // -------------------------------------------------------------------------------
 // Benchmark
 // -------------------------------------------------------------------------------
-export async function benchmark_compression() {
-  await compression()
-}
-export async function benchmark_measurement() {
-  await measurement()
-}
 export async function benchmark() {
-  await benchmark_compression()
-  await benchmark_measurement()
+  await Benchmark.compression()
+  await Benchmark.measurement()
 }
 // -------------------------------------------------------------------------------
 // Test
@@ -58,25 +53,26 @@ export async function test(filter = '') {
 // Build
 // -------------------------------------------------------------------------------
 export async function build(target = 'target/build') {
-  await folder(target).delete()
   await test()
-  await shell(`tsc -p ./src/tsconfig.json --outDir ${target}  --target ES2020 --module CommonJS --declaration --removeComments`)
-  await folder(target).add('package.json')
+  await clean()
+  await Promise.all([
+    Build.buildDefault(target),
+    Build.buildImport(target),
+    Build.buildTypes(target),
+    Build.buildRedirect(target),
+    Build.buildPackageJson(target)
+  ])
   await folder(target).add('readme.md')
   await folder(target).add('license')
   await shell(`cd ${target} && npm pack`)
 }
 // -------------------------------------------------------------------------------
 // Install
 // -------------------------------------------------------------------------------
-export async function install_local(target = 'target/typebox') {
+export async function install() {
   await clean()
-  await build(target)
-  await folder('node_modules').add(target)
-  const packagePath = `${target}/package.json`
-  const packageJson = JSON.parse(Fs.readFileSync(packagePath, 'utf-8'))
-  packageJson.name = 'typebox'
-  Fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2))
+  await build('target/typebox')
+  await folder('node_modules').add('target/typebox')
 }
 // -------------------------------------------------------------
 // Publish

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.32.0-dev-4",
-  "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
+  "version": "0.32.0-dev-5",
+  "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",
     "json-schema",
@@ -10,28 +10,16 @@
   ],
   "author": "sinclairzx81",
   "license": "MIT",
-  "main": "./index.js",
-  "types": "./index.d.ts",
-  "exports": {
-    "./compiler": "./compiler/index.js",
-    "./errors": "./errors/index.js",
-    "./system": "./system/index.js",
-    "./type": "./type/index.js",
-    "./value": "./value/index.js",
-    ".": "./index.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/sinclairzx81/typebox"
   },
   "scripts": {
-    "benchmark:compression": "hammer task benchmark_compression",
-    "benchmark:measurement": "hammer task benchmark_measurement",
-    "benchmark": "hammer task benchmark",
-    "install:local": "hammer task install_local",
     "test:typescript": "hammer task test_typescript",
     "test:static": "hammer task test_static",
     "test:runtime": "hammer task test_runtime",
+    "benchmark": "hammer task benchmark",
+    "install": "hammer task install",
     "build": "hammer task build",
     "test": "hammer task test",
     "clean": "hammer task clean",

task/build/default.ts

@@ -0,0 +1,5 @@
+declare function shell(command: string): Promise<void>
+
+export async function buildDefault(target: string) {
+  await shell(`tsc -p ./src/tsconfig.json --outDir ${target}/build/default  --target ES2020 --module CommonJS --removeComments`)
+}

task/build/esm.ts → task/build/import.ts

@@ -1,9 +1,17 @@
-// ------------------------------------------------------------------
-// Node-ESM-Transform
-// ------------------------------------------------------------------
+declare function shell(command: string): Promise<void>
 import * as Path from 'node:path'
 import * as Fs from 'node:fs'
 
+// ------------------------------------------------------------------
+// Build
+// ------------------------------------------------------------------
+export async function buildImport(target: string) {
+  await shell(`tsc -p ./src/tsconfig.json --outDir ${target}/build/import --target ESNext --module ESNext --removeComments`)
+  convertToEsm(`${target}/build/import`)
+}
+// ------------------------------------------------------------------
+// Node-ESM-Transform
+// ------------------------------------------------------------------
 // prettier-ignore
 function shouldProcess(sourcePath: string) {
   const extname = Path.extname(sourcePath)
@@ -50,7 +58,6 @@ function readDirectory(sourceDirectory: string) {
     processSourcePath(sourcePath)
   }
 }
-/** Transforms modules within sourceDirectory to Node ESM */
 // prettier-ignore
 export function convertToEsm(sourceDirectory: string) {
   readDirectory(sourceDirectory)

task/build/index.ts

@@ -1 +1,5 @@
-export * from './esm'
+export * from './default'
+export * from './import'
+export * from './package'
+export * from './redirect'
+export * from './types'

task/build/package.ts

@@ -0,0 +1,56 @@
+import { submodules } from './submodules'
+import * as Fs from 'node:fs'
+
+// prettier-ignore
+export function buildPackageJson(target: string) {
+  const content = JSON.stringify(resolvePackageJson(), null, 2)
+  Fs.writeFileSync(`${target}/package.json`, content, 'utf-8')
+}
+// prettier-ignore
+function resolveSubmoduleExports(submodule: string) {
+  return {
+    types: `./build/types/${submodule}/index.d.ts`,
+    default: `./build/default/${submodule}/index.js`,
+    import: `./build/import/${submodule}/index.mjs`
+  }
+}
+// prettier-ignore
+function resolveIndexExport() {
+  return {
+    "types": "./build/types/index.d.ts",
+    "default": "./build/default/index.js",
+    "import": "./build/import/index.mjs"
+  }
+}
+// prettier-ignore
+function resolveExports() {
+  const exports = submodules.reduce((acc, submodule) => {
+    return { ...acc, [`./${submodule}`]: resolveSubmoduleExports(submodule) }
+  }, {
+    ".": resolveIndexExport()
+  })
+  return { exports }
+}
+// prettier-ignore
+function resolveMetadata() {
+  const packageJson = JSON.parse(Fs.readFileSync('package.json', 'utf-8'))
+  return {
+    name: packageJson.name,
+    version: packageJson.version,
+    description: packageJson.description,
+    keywords: packageJson.keywords,
+    author: packageJson.author,
+    license: packageJson.license,
+    repository: packageJson.repository,
+    types: "./build/types/index.d.ts",
+    module: "./build/import/index.mjs",
+    main: "./build/default/index.js"
+  }
+}
+// prettier-ignore
+function resolvePackageJson() {
+  return {
+    ...resolveMetadata(),
+    ...resolveExports()
+  }
+}

task/build/redirect.ts

@@ -0,0 +1,20 @@
+import { submodules } from './submodules'
+import * as Fs from 'node:fs'
+
+function writeRedirect(target: string, submodule: string) {
+  Fs.mkdirSync(`${target}/${submodule}`, { recursive: true })
+  Fs.writeFileSync(
+    `${target}/${submodule}/package.json`,
+    JSON.stringify(
+      {
+        main: `../build/default/${submodule}/index.js`,
+        types: `../build/types/${submodule}/index.d.ts`,
+      },
+      null,
+      2,
+    ),
+  )
+}
+export function buildRedirect(target: string) {
+  submodules.forEach((submodule) => writeRedirect(target, submodule))
+}

task/build/submodules.ts

@@ -0,0 +1 @@
+export const submodules = ['compiler', 'errors', 'system', 'type', 'value']

task/build/types.ts

@@ -0,0 +1,5 @@
+declare function shell(command: string): Promise<void>
+
+export async function buildTypes(target: string) {
+  await shell(`tsc -p ./src/tsconfig.json --outDir ${target}/build/types  --target ES2020 --module CommonJS --removeComments --declaration --emitDeclarationOnly`)
+}