v-transform 2.2.1 → 2.2.2

package/src/parser.js

@@ -1,140 +1,140 @@
-import yaml from 'js-yaml'
-
-function isCommentKey(key) {
-    return key.startsWith('#')
-}
-
-function isJsonKey(key) {
-    return key.startsWith('@')
-}
-
-function processHeaderColumn(col, head, layer, subs, json) {
-    let key = head[col].trim()
-    if (isCommentKey(key)) return
-    if (isJsonKey(key)) {
-        json.push(col)
-        key = key.substr(1)
-    }
-    const [first, ...parts] = key.split(/[.:]/).map(p => p.trim())
-    if (!subs[first]) layer.push(first)
-    if (parts.length > 0) {
-        if (!subs[first]) subs[first] = {}
-        subs[first][col] = parts.join('.')
-    } else if (first.endsWith('[]')) {
-        if (!subs[first]) subs[first] = []
-        subs[first].push(col)
-    } else {
-        subs[first] = col
-    }
-}
-
-function createObjectSub(key, subs) {
-    subs = [parseStruct(subs[key])]
-    key = key.substr(0, key.length - 2)
-    return { type: 'object', key, subs }
-}
-
-function createArraySub(key, subs) {
-    if (Array.isArray(subs[key]))
-        subs = subs[key].map(source => ({ type: 'value', source }))
-    else subs = [parseStruct(subs[key])]
-    key = key.substr(0, key.length - 2)
-    return { type: 'array', key, subs }
-}
-
-function createValueSub(key, subs) {
-    const source = subs[key]
-    if (key.startsWith('$')) key = key.substr(1)
-    return { type: 'value', key, source }
-}
-
-function createNestedObjectSub(key, subs) {
-    return { type: 'object', key, subs: parseStruct(subs[key]).subs }
-}
-
-function createSubFromKey(key, subs) {
-    if (key.endsWith('{}')) return createObjectSub(key, subs)
-    if (key.endsWith('[]')) return createArraySub(key, subs)
-    if (typeof subs[key] === 'string') return createValueSub(key, subs)
-    return createNestedObjectSub(key, subs)
-}
-
-function parseStruct(head) {
-    const layer = []
-    const subs = {}
-    const json = []
-    for (const col in head) processHeaderColumn(col, head, layer, subs, json)
-    const struct = { type: 'object', subs: [], json }
-    for (const key of layer) {
-        if (key.startsWith('$')) struct.key = `#${subs[key]}`
-        const sub = createSubFromKey(key, subs)
-        struct.subs.push(sub)
-    }
-    return struct
-}
-
-function formatRow({ type, key, source, subs }, row, original, json) {
-    if (('' + row[0]).startsWith('#')) return null
-    if (key?.startsWith('#')) key = row[key.substr(1)]
-    switch (type) {
-        case 'value':
-            return formatValue(key, source, row[source], json)
-        case 'array':
-            return formatArray(key, subs, row, original, json)
-        case 'object':
-            return formatObject(key, subs, row, original, json)
-    }
-}
-
-function formatValue(key, source, value, json) {
-    if (value == null) return null
-    if (json.includes(source)) value = yaml.load(value)
-    return { key, value }
-}
-
-function formatArray(key, subs, row, original, json) {
-    const arr = original?.[key] || []
-    for (const sub of subs) {
-        const data = formatRow(sub, row, arr, json)
-        if (data) arr.push(data.value)
-    }
-    return arr.length ? { key, value: arr } : null
-}
-
-function formatObject(key, subs, row, original, json) {
-    const obj = original?.[key] || {}
-    let hasData = false
-    for (const sub of subs) {
-        const data = formatRow(sub, row, obj, json)
-        if (data) {
-            hasData = true
-            obj[data.key] = data.value
-        }
-    }
-    return hasData ? { key, value: obj } : null
-}
-
-function formatSheet(struct, rawSheet, json) {
-    let data
-    if (struct.key == void 0) {
-        data = []
-        for (const row of rawSheet) {
-            const temp = formatRow(struct, row, null, json)
-            if (temp) data.push(temp.value)
-        }
-    } else {
-        data = {}
-        for (const row of rawSheet) {
-            const temp = formatRow(struct, row, data, json)
-            if (temp) data[temp.key] = temp.value
-        }
-    }
-
-    return data
-}
-
-export function parser(rawSheet) {
-    const struct = parseStruct(rawSheet.shift())
-    rawSheet.shift()
-    return formatSheet(struct, rawSheet, struct.json)
-}
+import yaml from 'js-yaml'
+
+function isCommentKey(key) {
+    return key.startsWith('#')
+}
+
+function isJsonKey(key) {
+    return key.startsWith('@')
+}
+
+function processHeaderColumn(col, head, layer, subs, json) {
+    let key = head[col].trim()
+    if (isCommentKey(key)) return
+    if (isJsonKey(key)) {
+        json.push(col)
+        key = key.substr(1)
+    }
+    const [first, ...parts] = key.split(/[.:]/).map(p => p.trim())
+    if (!subs[first]) layer.push(first)
+    if (parts.length > 0) {
+        if (!subs[first]) subs[first] = {}
+        subs[first][col] = parts.join('.')
+    } else if (first.endsWith('[]')) {
+        if (!subs[first]) subs[first] = []
+        subs[first].push(col)
+    } else {
+        subs[first] = col
+    }
+}
+
+function createObjectSub(key, subs) {
+    subs = [parseStruct(subs[key])]
+    key = key.substr(0, key.length - 2)
+    return { type: 'object', key, subs }
+}
+
+function createArraySub(key, subs) {
+    if (Array.isArray(subs[key]))
+        subs = subs[key].map(source => ({ type: 'value', source }))
+    else subs = [parseStruct(subs[key])]
+    key = key.substr(0, key.length - 2)
+    return { type: 'array', key, subs }
+}
+
+function createValueSub(key, subs) {
+    const source = subs[key]
+    if (key.startsWith('$')) key = key.substr(1)
+    return { type: 'value', key, source }
+}
+
+function createNestedObjectSub(key, subs) {
+    return { type: 'object', key, subs: parseStruct(subs[key]).subs }
+}
+
+function createSubFromKey(key, subs) {
+    if (key.endsWith('{}')) return createObjectSub(key, subs)
+    if (key.endsWith('[]')) return createArraySub(key, subs)
+    if (typeof subs[key] === 'string') return createValueSub(key, subs)
+    return createNestedObjectSub(key, subs)
+}
+
+function parseStruct(head) {
+    const layer = []
+    const subs = {}
+    const json = []
+    for (const col in head) processHeaderColumn(col, head, layer, subs, json)
+    const struct = { type: 'object', subs: [], json }
+    for (const key of layer) {
+        if (key.startsWith('$')) struct.key = `#${subs[key]}`
+        const sub = createSubFromKey(key, subs)
+        struct.subs.push(sub)
+    }
+    return struct
+}
+
+function formatRow({ type, key, source, subs }, row, original, json) {
+    if (('' + row[0]).startsWith('#')) return null
+    if (key?.startsWith('#')) key = row[key.substr(1)]
+    switch (type) {
+        case 'value':
+            return formatValue(key, source, row[source], json)
+        case 'array':
+            return formatArray(key, subs, row, original, json)
+        case 'object':
+            return formatObject(key, subs, row, original, json)
+    }
+}
+
+function formatValue(key, source, value, json) {
+    if (value == null) return null
+    if (json.includes(source)) value = yaml.load(value)
+    return { key, value }
+}
+
+function formatArray(key, subs, row, original, json) {
+    const arr = original?.[key] || []
+    for (const sub of subs) {
+        const data = formatRow(sub, row, arr, json)
+        if (data) arr.push(data.value)
+    }
+    return arr.length ? { key, value: arr } : null
+}
+
+function formatObject(key, subs, row, original, json) {
+    const obj = original?.[key] || {}
+    let hasData = false
+    for (const sub of subs) {
+        const data = formatRow(sub, row, obj, json)
+        if (data) {
+            hasData = true
+            obj[data.key] = data.value
+        }
+    }
+    return hasData ? { key, value: obj } : null
+}
+
+function formatSheet(struct, rawSheet, json) {
+    let data
+    if (struct.key == void 0) {
+        data = []
+        for (const row of rawSheet) {
+            const temp = formatRow(struct, row, null, json)
+            if (temp) data.push(temp.value)
+        }
+    } else {
+        data = {}
+        for (const row of rawSheet) {
+            const temp = formatRow(struct, row, data, json)
+            if (temp) data[temp.key] = temp.value
+        }
+    }
+
+    return data
+}
+
+export function parser(rawSheet) {
+    const struct = parseStruct(rawSheet.shift())
+    rawSheet.shift()
+    return formatSheet(struct, rawSheet, struct.json)
+}

package/src/prepare.js

@@ -1,23 +1,23 @@
-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)) {
-        case '.xls':
-        case '.xlsx':
-            break
-        default:
-            return []
-    }
-    const xlsxFileBuffer = await readFile(xlsxPath)
-    const xlsx = read(xlsxFileBuffer, { type: 'buffer' })
-    const datas = []
-    for (const name in xlsx.Sheets) {
-        const sheetRawData = xlsx.Sheets[name]
-        if (!sheetRawData['!ref']) break
-        const data = utils.sheet_to_json(sheetRawData, { header: 1 })
-        datas.push({ name, data })
-    }
-    return datas
-}
+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)) {
+        case '.xls':
+        case '.xlsx':
+            break
+        default:
+            return []
+    }
+    const xlsxFileBuffer = await readFile(xlsxPath)
+    const xlsx = read(xlsxFileBuffer, { type: 'buffer' })
+    const datas = []
+    for (const name in xlsx.Sheets) {
+        const sheetRawData = xlsx.Sheets[name]
+        if (!sheetRawData['!ref']) break
+        const data = utils.sheet_to_json(sheetRawData, { header: 1 })
+        datas.push({ name, data })
+    }
+    return datas
+}

package/src/transform.js

@@ -1,93 +1,93 @@
-import path from 'node:path'
-import { load } from './loader.js'
-import { prepare } from './prepare.js'
-import { parser } from './parser.js'
-import { dump } from './dump.js'
-
-export async function transform(options) {
-    const now = Date.now()
-    const configurations = await load(options)
-    for (const config of configurations) await task(config)
-    console.info(`Transformed in ${Date.now() - now}ms`)
-}
-
-async function task({ files, dest, cwd, type, space, addition }) {
-    console.info('Transform task config:', { files, dest, cwd, type, space })
-    const m = new Map()
-    for (const file of files) {
-        const dir = path.resolve(dest, path.dirname(file))
-        const prepared = await prepare(path.resolve(cwd, file))
-        processPrepared(prepared, dir, m)
-    }
-    for (const [sheet, job] of m) {
-        const data = job.result()
-        if (addition) await dump(sheet, { data, ...addition }, type, space)
-        else await dump(sheet, data, type, space)
-    }
-}
-
-function processPrepared(prepared, dir, m) {
-    for (const { name, data } of prepared) {
-        if (name.startsWith('#')) continue
-        const { sheet, keys } = parseSheetAndKeys(name, dir)
-        if (!m.has(sheet)) m.set(sheet, new JobData())
-        m.get(sheet).append({ keys, data: parser(data) })
-    }
-}
-
-function parseSheetAndKeys(name, dir) {
-    let sheet = name.split('#')[0]
-    sheet = sheet.replace('<arr>', '')
-    if (sheet.startsWith('>')) sheet = sheet.substring(1)
-    const keys = sheet.split('.')
-    sheet = path.resolve(dir, keys.shift())
-    return { sheet, keys }
-}
-
-class JobData {
-    constructor(data) {
-        if (data) this.append(data)
-    }
-
-    #data = []
-
-    append(data) {
-        this.#data.push(data)
-    }
-
-    result() {
-        if (!this.#data.length) return {}
-        let result
-        for (const { keys, data } of this.#data) {
-            if (!keys.length) {
-                result = this.#combine(result, data)
-                continue
-            }
-            if (!result) result = {}
-            let r = result
-            let last = keys.pop()
-            for (const key of keys) {
-                if (!r[key]) r[key] = {}
-                r = r[key]
-            }
-            r[last] = this.#combine(r[last], data)
-        }
-        return result
-    }
-
-    #combine(a, b) {
-        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
-        }
-        if (Array.isArray(a)) return this.#combine(a, Object.values(b))
-        if (Array.isArray(b)) return this.#combine(Object.values(a), b)
-        const result = {}
-        for (const key in a) result[key] = this.#combine(a[key], b[key])
-        for (const key in b) if (!result[key]) result[key] = b[key]
-        return result
-    }
-}
+import path from 'node:path'
+import { load } from './loader.js'
+import { prepare } from './prepare.js'
+import { parser } from './parser.js'
+import { dump } from './dump.js'
+
+export async function transform(options) {
+    const now = Date.now()
+    const configurations = await load(options)
+    for (const config of configurations) await task(config)
+    console.info(`Transformed in ${Date.now() - now}ms`)
+}
+
+async function task({ files, dest, cwd, type, space, addition }) {
+    console.info('Transform task config:', { files, dest, cwd, type, space })
+    const m = new Map()
+    for (const file of files) {
+        const dir = path.resolve(dest, path.dirname(file))
+        const prepared = await prepare(path.resolve(cwd, file))
+        processPrepared(prepared, dir, m)
+    }
+    for (const [sheet, job] of m) {
+        const data = job.result()
+        if (addition) await dump(sheet, { data, ...addition }, type, space)
+        else await dump(sheet, data, type, space)
+    }
+}
+
+function processPrepared(prepared, dir, m) {
+    for (const { name, data } of prepared) {
+        if (name.startsWith('#')) continue
+        const { sheet, keys } = parseSheetAndKeys(name, dir)
+        if (!m.has(sheet)) m.set(sheet, new JobData())
+        m.get(sheet).append({ keys, data: parser(data) })
+    }
+}
+
+function parseSheetAndKeys(name, dir) {
+    let sheet = name.split('#')[0]
+    sheet = sheet.replace('<arr>', '')
+    if (sheet.startsWith('>')) sheet = sheet.substring(1)
+    const keys = sheet.split('.')
+    sheet = path.resolve(dir, keys.shift())
+    return { sheet, keys }
+}
+
+class JobData {
+    constructor(data) {
+        if (data) this.append(data)
+    }
+
+    #data = []
+
+    append(data) {
+        this.#data.push(data)
+    }
+
+    result() {
+        if (!this.#data.length) return {}
+        let result
+        for (const { keys, data } of this.#data) {
+            if (!keys.length) {
+                result = this.#combine(result, data)
+                continue
+            }
+            if (!result) result = {}
+            let r = result
+            let last = keys.pop()
+            for (const key of keys) {
+                if (!r[key]) r[key] = {}
+                r = r[key]
+            }
+            r[last] = this.#combine(r[last], data)
+        }
+        return result
+    }
+
+    #combine(a, b) {
+        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
+        }
+        if (Array.isArray(a)) return this.#combine(a, Object.values(b))
+        if (Array.isArray(b)) return this.#combine(Object.values(a), b)
+        const result = {}
+        for (const key in a) result[key] = this.#combine(a[key], b[key])
+        for (const key in b) if (!result[key]) result[key] = b[key]
+        return result
+    }
+}

package/.trunk/trunk.yaml

@@ -1,5 +0,0 @@
-# This file controls the behavior of Trunk: https://docs.trunk.io/cli
-# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
-version: 0.1
-cli:
-  version: 1.22.10

package/dist/blindDate/dimension.json

@@ -1,138 +0,0 @@
-{
-    "sex": {
-        "1": {
-            "id": 1,
-            "description": "男",
-            "weight": 1,
-            "value": 1
-        },
-        "2": {
-            "id": 2,
-            "description": "女",
-            "weight": 1,
-            "value": 1
-        },
-        "3": {
-            "id": 3,
-            "description": "mtf",
-            "weight": 0.1,
-            "value": 10
-        },
-        "4": {
-            "id": 4,
-            "description": "ftm",
-            "weight": 0.1,
-            "value": 10
-        }
-    },
-    "age": {
-        "1": {
-            "id": 1,
-            "description": "18岁",
-            "weight": 0.1,
-            "value": 10
-        },
-        "2": {
-            "id": 2,
-            "description": "19岁",
-            "weight": 0.2,
-            "value": 9
-        }
-    },
-    "backing": {
-        "1": {
-            "id": 1,
-            "description": "当官的",
-            "weight": 1,
-            "value": 1
-        },
-        "2": {
-            "id": 2,
-            "description": "老农民",
-            "weight": 1,
-            "value": 1
-        }
-    },
-    "education": {
-        "1": {
-            "id": 1,
-            "description": "小学",
-            "weight": 1,
-            "value": 1
-        },
-        "2": {
-            "id": 2,
-            "description": "初中",
-            "weight": 1,
-            "value": 1
-        }
-    },
-    "figure": {
-        "1": {
-            "id": 1,
-            "description": "健康美",
-            "weight": 1,
-            "value": 10
-        },
-        "2": {
-            "id": 2,
-            "description": "病弱美",
-            "weight": 1,
-            "value": 5
-        },
-        "3": {
-            "id": 3,
-            "description": "病态丑",
-            "weight": 1,
-            "value": 1
-        }
-    },
-    "height": {
-        "1": {
-            "id": 1,
-            "description": "250cm",
-            "weight": 1,
-            "value": 25
-        },
-        "2": {
-            "id": 2,
-            "description": "180cm",
-            "weight": 5,
-            "value": 18
-        },
-        "3": {
-            "id": 3,
-            "description": "170cm",
-            "weight": 10,
-            "value": 17
-        }
-    },
-    "income": {
-        "1": {
-            "id": 1,
-            "description": 0,
-            "weight": 1,
-            "value": 1
-        },
-        "2": {
-            "id": 2,
-            "description": "1-3000",
-            "weight": 1,
-            "value": 1
-        }
-    },
-    "profession": {
-        "1": {
-            "id": 1,
-            "description": "程序员",
-            "weight": 1,
-            "value": 1
-        },
-        "2": {
-            "id": 2,
-            "description": "游戏策划",
-            "weight": 1,
-            "value": 1
-        }
-    }
-}