v-transform 3.0.0 → 3.1.0

package/package.json

@@ -4,7 +4,7 @@
     "vt": "src/index.js"
   },
   "type": "module",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "main": "index.js",
   "scripts": {
     "clean": "npx rimraf test",

package/src/dump.js

@@ -15,15 +15,14 @@ function jp(data, space) {
     return `JSON.parse(\n\t'${json}'\n)`
 }
 
-function map(raw, pk, space) {
-    const isArray = !pk || Array.isArray(raw)
-    if (isArray || typeof raw !== 'object') {
-        const data = jp(j(raw, space))
-        return { data: jp(j(raw, space)), type: isArray ? 'array' : 'object' }
+function map(raw, pk, space, enable) {
+    if (Array.isArray(raw)) {
+        return { data: jp(raw, space), type: 'array' }
     }
+    if (!pk || !enable) return { data: jp(raw, space), type: 'object' }
     const data = Object.values(raw).map(v => [v[pk], v])
     console.info(`🔁 [Dump] Object -> Map [${pk}]`)
-    return { data: `new Map(${jp(j(data, space))})`, type: 'map' }
+    return { data: `new Map(${jp(data, space)})`, type: 'map' }
 }
 
 function withType(main, sub, pk) {
@@ -34,28 +33,28 @@ function withType(main, sub, pk) {
             if (sub === 'any') return `Map<${sub}, ${sub}>`
             return `Map<${sub}['${pk}'], ${sub}>`
         case 'object':
-            return `{ [key: string]: ${sub} }`
+            return `Record<${sub}['${pk}'], ${sub}>`
         default:
             return sub
     }
 }
 
-function jsonify(name, data, space) {
+function jsonify({ name, data, space }) {
     const { raw, addition, dts } = data
     const json = j(addition ? { [name]: raw, ...addition } : raw, space)
     return [json, dts]
 }
 
-function yamlify(name, data, indent) {
+function yamlify({ name, data, space }) {
     const { raw, addition, dts } = data
-    const opt = { indent: indent || undefined }
+    const opt = { indent: space || undefined }
     const yaml = dumpYAML(addition ? { [name]: raw, ...addition } : raw, opt)
     return [yaml, dts]
 }
 
-function cjsify(name, data, space, types) {
+function cjsify({ name, data, space, types, toMap }) {
     const { type, pk, dts, addition } = data
-    const converted = map(data.raw, pk, space)
+    const converted = map(data.raw, pk, space, toMap)
     const r = []
     if (types && dts) {
         r.push(`/** @typedef {import('./${name}').${type}} ${type} */`)
@@ -73,9 +72,9 @@ function cjsify(name, data, space, types) {
     return [r.join('\n'), dts]
 }
 
-function esmify(name, data, space, types) {
+function esmify({ name, data, space, types, toMap }) {
     const { type, pk, dts, addition } = data
-    const converted = map(data.raw, pk, space)
+    const converted = map(data.raw, pk, space, toMap)
     const rows = []
     if (types && dts) {
         rows.push(`/** @typedef {import('./${name}').${type}} ${type} */`)
@@ -91,9 +90,9 @@ function esmify(name, data, space, types) {
     return [rows.join('\n'), dts]
 }
 
-function tsify(name, data, space) {
+function tsify({ name, data, space, toMap }) {
     const { pk, addition } = data
-    const converted = map(data.raw, pk, space)
+    const converted = map(data.raw, pk, space, toMap)
     const type = withType(converted.type, data.type, pk)
     const rows = [data.dts]
     rows.push(`export const ${name} = ${converted.data} as unknown as ${type};`)
@@ -123,7 +122,7 @@ async function write(sheet, data) {
     await writeFile(sheet, data)
 }
 
-export async function dump({ sheet, data, type, space, name, ext, types }) {
+export async function dump({ sheet, type, ext, map, types, ...args }) {
     let e, ify
     switch (type) {
         case 'ts':
@@ -152,29 +151,8 @@ export async function dump({ sheet, data, type, space, name, ext, types }) {
             break
     }
 
-    const [main, dts] = ify(name, data, space, types)
+    const [main, dts] = ify({ ...args, types, toMap: map })
     const result = await write(`${sheet}${ext || e}`, main)
     if (types && dts) await write(`${sheet}.d.ts`, dts)
-
-    // if (type !== 'ts' && data?.extra?.types) {
-    //     const { types, typeSign } = data.extra
-    //     const cleanTypes = String(types).trim() + '\n'
-
-    //     const dtsLines = [
-    //         cleanTypes,
-    //         `export declare const ${name}: ${typeSign};`,
-    //         `export default ${name};`,
-    //     ]
-
-    //     if (data.addition) {
-    //         Object.entries(data.addition).forEach(([key, value]) => {
-    //             dtsLines.push(`export declare const ${key}: ${typeof value};`)
-    //         })
-    //     }
-
-    //     const dtsContent = dtsLines.join('\n') + '\n'
-    //     await write(`${sheet}.d.ts`, dtsContent)
-    // }
-
     return result
 }

package/src/index.js

@@ -22,6 +22,7 @@ program
     .option('-e, --ext <ext>', 'file ext', null)
     .option('-a, --addition', 'addition version', false)
     .option('-x, --notypes', 'disable types generation', false)
+    .option('-m, --map', 'enable map generation', false)
     .action((list, options) => {
         if (!options.dest) options.dest = options.output
         options.list = list

package/src/loader.js

@@ -4,14 +4,15 @@ import path from 'node:path'
 import { readFile } from 'node:fs/promises'
 
 export async function load(args) {
-    const { config, list, addition, ext } = args
+    const { config, list, ...a } = args
     const version = new Date().toISOString()
     const type = args.type || 'json'
     const cwd = args.cwd || process.cwd()
     const space = Number(args.space) || 0
     const dest = args.dest || cwd
     const types = !args.notypes
-    const def = { cwd, type, space, dest, addition, ext, types }
+    const map = args.map || false
+    const def = { ...a, cwd, type, space, dest, types, map }
     const m = (...l) => globit(Object.assign({}, ...l))
     const cfgs = []
 

package/src/transform.js

@@ -13,8 +13,8 @@ export async function transform(options) {
 }
 
 async function task(options) {
-    const { files, dest, cwd, type, space, addition, ext, types } = options
     console.info('Transform task config:', 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))
@@ -22,8 +22,7 @@ async function task(options) {
     }
     for (const [sheet, job] of m) {
         const data = await job.result(addition)
-        const d = { sheet, data, type, space, name: job.name, ext, types }
-        await dump(d)
+        await dump({ ...opts, sheet, data, name: job.name })
     }
 }