v-transform 2.0.3 → 2.1.0

package/package.json

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

package/src/index.js

@@ -3,26 +3,27 @@ import { Command } from 'commander';
 import { readFile } from 'fs/promises';
 import { transform } from './transform.js';
 
-(async() => {
+(async () => {
 
-const program = new Command();
+    const program = new Command();
 
-program.name('vt');
-program.version(JSON.parse(await readFile('package.json')).version);
-program
-    .command('transform [list...]')
-    .option('-t, --type <type>', 'type of transform, available: js, esm, cjs, json', 'json')
-    .option('-s, --space <space>', 'format space number', 0)
-    .option('-c, --config <config>', 'configure file', null)
-    .option('-w, --cwd <cwd>', 'current work dir', null)
-    .option('-o, --output <output>', 'output dir', null)
-    .option('-d, --dest <dest>', 'dest dir', null)
-    .action((list, options) => {
-        if(!options.dest) options.dest = options.output;
-        options.list = list;
-        transform(options);
-    });
+    program.name('vt');
+    program.version(JSON.parse(await readFile('package.json')).version);
+    program
+        .command('transform [list...]')
+        .option('-t, --type <type>', 'type of transform, available: js, esm, cjs, json', 'json')
+        .option('-s, --space <space>', 'format space number', 0)
+        .option('-c, --config <config>', 'configure file', null)
+        .option('-w, --cwd <cwd>', 'current work dir', null)
+        .option('-o, --output <output>', 'output dir', null)
+        .option('-d, --dest <dest>', 'dest dir', null)
+        .option('-a, --addition', 'addition version', false)
+        .action((list, options) => {
+            if (!options.dest) options.dest = options.output;
+            options.list = list;
+            transform(options);
+        });
 
-program.parse(process.argv);
+    program.parse(process.argv);
 
 })();

package/src/loader.js

@@ -3,38 +3,43 @@ import yaml from 'js-yaml';
 import path from 'path';
 import { readFile } from 'fs/promises';
 
-export async function load({type, space, config, dest, list, cwd}) {
+export async function load({ type, space, config, dest, list, cwd, addition }) {
+    const version = new Date().toISOString();
     type = type || 'json';
     cwd = cwd || process.cwd();
     space = Number(space) || 0;
     dest = dest || cwd;
-    const def = {cwd, type, space, dest};
-    const m = (...l)=>globit(Object.assign({}, ...l));
+    const def = { cwd, type, space, dest, addition };
+    const m = (...l) => globit(Object.assign({}, ...l));
     const cfgs = [];
 
-    if(list?.length)
-        cfgs.unshift(await m(def, {glob: list}));
+    if (list?.length)
+        cfgs.unshift(await m(def, { glob: list }));
 
-    if(config) {
+    if (config) {
         const c = await loadConfig(config);
         const dir = path.dirname(config);
         const cdef = {};
-        if(c.cwd) cdef.cwd = path.resolve(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);
-        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 (c.cwd) cdef.cwd = path.resolve(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);
+        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);
             cfgs.push(await m(def, cdef, cfg));
         }
     }
 
+    for (const cfg of cfgs)
+        if (cfg.addition)
+            cfg.addition = { version, timestamp: version }
+
     return cfgs;
 }
 
 async function loadConfig(config) {
-    switch(path.extname(config)) {
+    switch (path.extname(config)) {
         case '.json':
         case '.yaml':
         case '.yml':
@@ -50,18 +55,18 @@ async function loadConfig(config) {
 }
 
 async function globit(options) {
-    const {glob: gs, cwd} = options;
+    const { glob: gs, cwd } = options;
     const files = [];
-    const g = p=>new Promise(r=>glob(
-        p, {cwd}, (err, files) => r(err?[]:files)
+    const g = p => new Promise(r => glob(
+        p, { cwd }, (err, files) => r(err ? [] : files)
     ))
-    if(Array.isArray(gs))
-        for(const p of gs)
+    if (Array.isArray(gs))
+        for (const p of gs)
             files.push(...await g(p));
-    else if(typeof gs == 'string')
+    else if (typeof gs == 'string')
         files.push(...await g(gs));
     else
         throw new Error(`Unknown glob type: ${gs}`);
 
-    return Object.assign({files}, options);
+    return Object.assign({ files }, options);
 }

package/src/transform.js

@@ -12,7 +12,7 @@ export async function transform(options) {
     console.info(`Transformed in ${Date.now() - now}ms`);
 }
 
-async function task({ files, dest, cwd, type, space }) {
+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) {
@@ -31,8 +31,13 @@ async function task({ files, dest, cwd, type, space }) {
             });
         }
     }
-    for (const [sheet, data] of m)
-        await dump(sheet, data.result(), type, space);
+    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);
+    }
 }
 
 class JobData {