v-transform 3.1.2 → 3.2.1

package/package.json

@@ -4,28 +4,32 @@
     "vt": "bin/index.js"
   },
   "type": "module",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "main": "src/index.js",
   "scripts": {
     "clean": "npx rimraf test",
     "vt": "vt",
     "transform": "vt transform",
-    "build": "tsup src/index.js -d bin --format esm --minify"
+    "build": "bun build src/index.js --target=bun --format=esm --minify --outfile=bin/index.js"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/VickScarlet/vTransform.git"
+    "url": "git+https://github.com/VickScarlet/v-transform.git"
   },
   "author": "Vick Scarlet <scarlet_vick@outlook.com>",
   "license": "MIT",
   "devDependencies": {
     "commander": "^15.0.0",
-    "glob": "^13.0.6",
     "js-yaml": "^5.2.3",
     "ts-to-zod": "^5.1.0",
-    "tsup": "^8.5.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "zod": "^4.4.3"
   },
-  "files": ["bin", "src"]
+  "overrides": {
+    "@oclif/core": "^4"
+  },
+  "files": [
+    "bin",
+    "src"
+  ]
 }

package/src/calibrator.js

@@ -1,16 +1,18 @@
-import fs from 'node:fs'
 import { generate } from 'ts-to-zod'
 import { z } from 'zod'
 globalThis.__GLOBAL_ZOD__ = z
 
 export async function calibrateTsData(raw, name, dts) {
-    if (!dts || !fs.existsSync(dts)) {
+    const targetFile = Bun.file(dts)
+    if (!dts || !(await targetFile.exists())) {
         console.warn(`⚠️ [Calibrator] ${name}.types.ts`)
         return { raw, type: 'any', dts: '' }
     }
 
     console.info(`🔍 [Calibrator] ${name}.types.ts`)
-    const sourceText = fs.readFileSync(dts, 'utf-8')
+
+    const sourceText = await targetFile.text()
+
     const options = {
         keepOptionalProperties: true,
         getSchemaName: identifier => `${identifier}Schema`,
@@ -35,6 +37,14 @@ export async function calibrateTsData(raw, name, dts) {
         },
     }
     let zodRawCode = zod.getZodSchemasFile()
+
+    globalThis.__RUNNER_CONFIG_MODULE__ = configModule
+    zodRawCode = zodRawCode.replace(
+        /import\s+\{([^}]+)\}\s+from\s+['"]undefined['"];?/g,
+        (match, enumNamesStr) =>
+            `const {${enumNamesStr}} = globalThis.__RUNNER_CONFIG_MODULE__;`,
+    )
+
     zodRawCode = zodRawCode.replace(
         /import\s+\{\s*z\s*\}\s+from\s+['"]zod['"];?/g,
         'const z = globalThis.__GLOBAL_ZOD__;',
@@ -62,6 +72,7 @@ export async function calibrateTsData(raw, name, dts) {
     const RowZodValidator = zodModule[targetSchemaName]
     if (!RowZodValidator) {
         delete globalThis.__MERGED_TRANSFORMERS__
+        delete globalThis.__RUNNER_CONFIG_MODULE__
         throw new Error(`❌ [Calibrator] ${targetSchemaName} Missmatch`)
     }
     const typeName = targetSchemaName.replace(/Schema$/, '')
@@ -85,6 +96,7 @@ export async function calibrateTsData(raw, name, dts) {
             const parseResult = RowZodValidator.safeParse(raw[i])
             if (!parseResult.success) {
                 delete globalThis.__MERGED_TRANSFORMERS__
+                delete globalThis.__RUNNER_CONFIG_MODULE__
                 printZodError(name, i, parseResult.error.issues, raw[i])
             }
             raw[i] = parseResult.data
@@ -95,6 +107,7 @@ export async function calibrateTsData(raw, name, dts) {
             const parseResult = RowZodValidator.safeParse(raw[key])
             if (!parseResult.success) {
                 delete globalThis.__MERGED_TRANSFORMERS__
+                delete globalThis.__RUNNER_CONFIG_MODULE__
                 printZodError(name, key, parseResult.error.issues, raw[key])
             }
             raw[key] = parseResult.data
@@ -103,6 +116,7 @@ export async function calibrateTsData(raw, name, dts) {
     }
 
     delete globalThis.__MERGED_TRANSFORMERS__
+    delete globalThis.__RUNNER_CONFIG_MODULE__
     return data
 }
 

package/src/dump.js

@@ -1,6 +1,4 @@
 import { dump as dumpYAML } from 'js-yaml'
-import path from 'node:path'
-import { writeFile, stat, mkdir } from 'node:fs/promises'
 
 function j(data, space) {
     return JSON.stringify(data, null, space)
@@ -104,22 +102,9 @@ function tsify({ name, data, space, toMap }) {
     return [rows.join('\n')]
 }
 
-async function mkdirs(dir) {
-    try {
-        await stat(dir)
-    } catch (e) {
-        if (e.code !== 'ENOENT') {
-            throw e
-        }
-        await mkdirs(path.dirname(dir))
-        await mkdir(dir)
-    }
-}
-
 async function write(sheet, data) {
     console.info(`📦 -> ${sheet}`)
-    await mkdirs(path.dirname(sheet))
-    await writeFile(sheet, data)
+    return await Bun.write(sheet, data)
 }
 
 export async function dump({ sheet, type, ext, map, types, ...args }) {

package/src/index.js

@@ -1,12 +1,14 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 import { Command } from 'commander'
-import { readFile } from 'node:fs/promises'
 import { transform } from './transform.js'
 
 const program = new Command()
 
 program.name('vt')
-program.version(JSON.parse(await readFile('package.json')).version)
+
+const pkg = await Bun.file('package.json').json()
+program.version(pkg.version)
+
 program
     .command('transform [list...]')
     .option(
@@ -14,7 +16,7 @@ program
         'type of transform, available: js, ts, esm, cjs, json',
         'json',
     )
-    .option('-s, --space <space>', 'format space number', 0)
+    .option('-s, --space <space>', 'format space number', Number, 0)
     .option('-c, --config <config>', 'configure file', null)
     .option('-w, --cwd <cwd>', 'current work dir', null)
     .option('-o, --output <output>', 'output dir', null)
@@ -29,4 +31,4 @@ program
         transform(options)
     })
 
-program.parse(process.argv)
+program.parse(Bun.argv)

package/src/loader.js

@@ -1,13 +1,10 @@
-import { glob } from 'glob'
 import { load as loadYAML } from 'js-yaml'
-import path from 'node:path'
-import { readFile } from 'node:fs/promises'
 
 export async function load(args) {
     const { config, list, ...a } = args
     const version = new Date().toISOString()
     const type = args.type || 'json'
-    const cwd = args.cwd || process.cwd()
+    const cwd = args.cwd || Bun.cwd
     const space = Number(args.space) || 0
     const dest = args.dest || cwd
     const types = !args.notypes
@@ -32,17 +29,18 @@ export async function load(args) {
 
 async function loadConfigData(config, def, m) {
     const c = await loadConfig(config)
-    const dir = path.dirname(config)
+    const dir = config.substring(0, config.lastIndexOf('/')) || '.'
     const cdef = {}
-    if (c.cwd) cdef.cwd = path.resolve(dir, c.cwd)
+
+    if (c.cwd) cdef.cwd = `${dir}/${c.cwd}`
     if (c.type) cdef.type = c.type
     if (typeof c.space == 'number') cdef.space = c.space
-    if (c.dest) cdef.dest = path.resolve(dir, c.dest)
+    if (c.dest) cdef.dest = `${dir}/${c.dest}`
     const cfgs = []
 
     for (const cfg of c.configurations) {
-        if (cfg.cwd) cfg.cwd = path.resolve(dir, cfg.cwd)
-        if (cfg.dest) cfg.dest = path.resolve(dir, cfg.dest)
+        if (cfg.cwd) cfg.cwd = `${dir}/${cfg.cwd}`
+        if (cfg.dest) cfg.dest = `${dir}/${cfg.dest}`
         cfgs.push(await m(def, cdef, cfg))
     }
 
@@ -50,13 +48,15 @@ async function loadConfigData(config, def, m) {
 }
 
 async function loadConfig(config) {
-    switch (path.extname(config)) {
+    const ext = config.substring(config.lastIndexOf('.'))
+    switch (ext) {
         case '.json':
         case '.yaml':
         case '.yml':
-            return loadYAML(await readFile(config))
+            return loadYAML(await Bun.file(config).text())
         case '.js':
         case '.mjs':
+        case '.ts':
             return (await import(config)).default
         default:
             throw new Error(`Unknown config file type: ${config}`)
@@ -66,10 +66,23 @@ async function loadConfig(config) {
 async function globit(options) {
     const { glob: gs, cwd } = options
     const files = []
-    const g = p => glob(p, { cwd })
-    if (Array.isArray(gs)) for (const p of gs) files.push(...(await g(p)))
-    else if (typeof gs == 'string') files.push(...(await g(gs)))
-    else throw new Error(`Unknown glob type: ${gs}`)
+
+    const scanGlob = async pattern => {
+        const globInstance = new Bun.Glob(pattern)
+        const matched = []
+        for await (const file of globInstance.scan({ cwd })) {
+            matched.push(file)
+        }
+        return matched
+    }
+
+    if (Array.isArray(gs)) {
+        for (const p of gs) files.push(...(await scanGlob(p)))
+    } else if (typeof gs == 'string') {
+        files.push(...(await scanGlob(gs)))
+    } else {
+        throw new Error(`Unknown glob type: ${gs}`)
+    }
 
     return { ...options, files }
 }

package/src/prepare.js

@@ -1,16 +1,15 @@
-import path from 'node:path'
-import { readFile } from 'node:fs/promises'
 import { read, utils } from 'xlsx'
 
 export async function prepare(xlsxPath) {
-    switch (path.extname(xlsxPath)) {
+    const ext = xlsxPath.substring(xlsxPath.lastIndexOf('.')).toLowerCase()
+    switch (ext) {
         case '.xls':
         case '.xlsx':
             break
         default:
             return []
     }
-    const xlsxFileBuffer = await readFile(xlsxPath)
+    const xlsxFileBuffer = await Bun.file(xlsxPath).arrayBuffer()
     const xlsx = read(xlsxFileBuffer, { type: 'buffer' })
     const datas = []
     for (const name in xlsx.Sheets) {

package/src/transform.js

@@ -1,4 +1,3 @@
-import path from 'node:path'
 import { load } from './loader.js'
 import { prepare } from './prepare.js'
 import { parser } from './parser.js'
@@ -17,8 +16,8 @@ async function task(options) {
     const { files, dest, cwd, addition, ...opts } = options
     const m = new Map()
     for (const file of files) {
-        const dir = path.resolve(dest, path.dirname(file))
-        await processPrepared(path.resolve(cwd, file), dir, m)
+        const dir = `${dest}/${file.substring(0, file.lastIndexOf('/')) || '.'}`
+        await processPrepared(`${cwd}/${file}`, dir, m)
     }
     for (const [sheet, job] of m) {
         const data = await job.result(addition)
@@ -28,7 +27,7 @@ async function task(options) {
 
 async function processPrepared(src, dir, m) {
     const prepared = await prepare(src)
-    const xlsxDir = path.dirname(src)
+    const xlsxDir = src.substring(0, src.lastIndexOf('/')) || '.'
     for (const { name, data } of prepared) {
         if (name.startsWith('#')) continue
         const { sheet, keys, name: parsedName } = parseSheetAndKeys(name, dir)
@@ -43,7 +42,7 @@ function parseSheetAndKeys(name, dir) {
     if (sheet.startsWith('>')) sheet = sheet.substring(1)
     const keys = sheet.split('.')
     let key = keys.shift()
-    sheet = path.resolve(dir, key)
+    sheet = `${dir}/${key}`
     return { sheet, keys, name: key }
 }
 
@@ -80,7 +79,7 @@ class JobData {
             }
             r[last] = this.#combine(r[last], data)
         }
-        const dts = path.join(this.#xlsxDir, `${this.#name}.types.ts`)
+        const dts = `${this.#xlsxDir}/${this.#name}.types.ts`
         const data = await calibrateTsData(result, this.#name, dts)
         return { ...data, pk: this.#pk, addition }
     }
@@ -89,9 +88,7 @@ class JobData {
         if (a == null) return b
         if (b == null) return a
         if (Array.isArray(a) && Array.isArray(b)) {
-            if (Array.isArray(b)) return a.concat(b)
-            a.push(b)
-            return a
+            return a.concat(b)
         }
         if (Array.isArray(a)) return this.#combine(a, Object.values(b))
         if (Array.isArray(b)) return this.#combine(Object.values(a), b)