redput 1.0.3 → 1.2.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.08.14, v1.2.0
+
+feature:
+- aaebe09 redput: add support of simple plugins (when 'package.json' in current directory)
+
+2023.08.14, v1.1.0
+
+feature:
+- 3d1eed2 get-report: commonjs
+- 543a0a8 redput: get-report: add support of StringLiteral
+
 2023.08.14, v1.0.3
 
 feature:

package/lib/get-report/plugin-get-report/index.js

@@ -1,30 +1,55 @@
-import {operator} from 'putout';
+import {
+    operator,
+    types,
+} from 'putout';
 
+const {isStringLiteral} = types;
 const {getTemplateValues} = operator;
+
 const REPORT = 'export const report = () => __a';
+const REPORT_COMMONJS = 'module.exports.report = () => __a';
 const ASSIGN = 'export const report = __a';
 
+const templates = [
+    REPORT,
+    REPORT_COMMONJS,
+    ASSIGN,
+];
+
 export const report = ({value}) => value;
 export const fix = () => {};
-export const traverse = ({push}) => ({
-    [REPORT](path) {
-        const {__a} = getTemplateValues(path, REPORT);
-        
-        push({
-            path,
-            value: __a.quasis[0].value.cooked,
-        });
-        
-        path.stop();
-    },
-    [ASSIGN](path) {
-        const {__a} = getTemplateValues(path, ASSIGN);
-        
-        push({
-            path,
-            value: __a.quasis[0].value.cooked,
+export const traverse = ({push}) => {
+    const visitors = {};
+    
+    for (const template of templates) {
+        visitors[template] = process({
+            push,
+            template,
         });
-        
-        path.stop();
-    },
-});
+    }
+    
+    return visitors;
+};
+
+const process = ({push, template}) => (path) => {
+    const {__a} = getTemplateValues(path, template);
+    
+    if (!__a)
+        return;
+    
+    const value = parseValue(__a);
+    
+    push({
+        path,
+        value,
+    });
+    
+    path.stop();
+};
+
+function parseValue(a) {
+    if (isStringLiteral(a))
+        return a.value;
+    
+    return a.quasis[0].value.cooked;
+}

package/lib/redput.js

@@ -1,11 +1,11 @@
 import tryToCatch from 'try-to-catch';
+import {exists} from 'fs';
+import {access} from 'fs/promises';
 import {getReport} from './get-report/get-report.js';
 import {readGist} from './read-gist/read-gist.js';
-import {
-    writeRule,
-    writeFixtures,
-    writeTestForNested,
-} from './write.js';
+import {writePlugin} from './write/index.js';
+
+const SUCCESS = [null, 'Done'];
 
 const URL = 'https://putout.cloudcmd.io/#/gist/';
 
@@ -26,7 +26,7 @@ export const redput = async (link, {token}) => {
     const [comment, ...lines] = raw.split('\n');
     const name = comment.replace(/\/\/\s+?/, '');
     
-    if (name.includes(':'))
+    if (name.includes(':') || name.includes('{'))
         return [
             Error(`Bad name: ${name}`),
         ];
@@ -34,9 +34,12 @@ export const redput = async (link, {token}) => {
     const rule = lines.join('\n');
     const report = getReport(rule);
     
-    await writeRule(name, rule);
-    await writeFixtures(name, fixture);
-    await writeTestForNested(name, report);
+    writePlugin(name, {
+        rule,
+        fixture,
+        report,
+    });
     
-    return [null, 'Done'];
+    return SUCCESS;
 };
+

package/lib/write/index.js

@@ -0,0 +1,53 @@
+import rendy from 'rendy';
+import {
+    readFile,
+    writeFile,
+    mkdir,
+    access,
+} from 'fs/promises';
+import {
+    dirname,
+    basename,
+    join,
+} from 'path';
+import {
+    writeNestedFixtures,
+    writeNestedRule,
+    writeNestedTests,
+} from './nested.js';
+import {
+    writeFixtures,
+    writeRule,
+    writeTests,
+} from './simple.js';
+import tryToCatch from 'try-to-catch';
+
+export const writePlugin = async (name, {rule, fixture, report}) => {
+    const [isNested] = await tryToCatch(access, './package.json');
+    
+    if (isNested) {
+        return await writeNested(name, {
+            rule,
+            fixture,
+            report,
+        });
+    }
+    
+    await writeSimple(name, {
+        rule,
+        fixture,
+        report,
+    });
+};
+
+export const writeNested = async (name, {rule, fixture, report}) => {
+    await writeNestedRule(name, rule);
+    await writeNestedFixtures(name, fixture);
+    await writeNestedTests(name, report);
+};
+
+export const writeSimple = async (name, {rule, fixture, report}) => {
+    await writeRule(name, rule);
+    await writeFixtures(name, fixture);
+    await writeTests(name, report);
+};

package/lib/{write.js → write/nested.js}

@@ -1,16 +1,16 @@
-import rendy from 'rendy';
 import {
+    mkdir,
     readFile,
     writeFile,
-    mkdir,
 } from 'fs/promises';
 import {
-    dirname,
     basename,
+    dirname,
     join,
 } from 'path';
+import rendy from 'rendy';
 
-export const writeRule = async (name, data) => {
+export const writeNestedRule = async (name, data) => {
     await mkdir(`./${name}`, {
         recursive: true,
     });
@@ -18,7 +18,7 @@ export const writeRule = async (name, data) => {
     await writeFile(`./${name}/index.js`, data);
 };
 
-export const writeFixtures = async (name, data) => {
+export const writeNestedFixtures = async (name, data) => {
     await mkdir(`./${name}/fixture`, {
         recursive: true,
     });
@@ -27,8 +27,8 @@ export const writeFixtures = async (name, data) => {
     await writeFile(`./${name}/fixture/${name}-fix.js`, data);
 };
 
-export const writeTestForNested = async (name, report) => {
-    const templatePath = new URL('../templates/nested.js', import.meta.url).pathname;
+export const writeNestedTests = async (name, report) => {
+    const templatePath = new URL('../../templates/plugin.js', import.meta.url).pathname;
     const template = await readFile(templatePath, 'utf8');
     const nestedPluginName = basename(dirname(join(process.cwd(), '..')));
     const nested = nestedPluginName.replace('plugin-', '');
@@ -37,5 +37,6 @@ export const writeTestForNested = async (name, report) => {
         name,
         nested,
         report,
+        importPath: '.',
     }));
 };

package/lib/write/simple.js

@@ -0,0 +1,42 @@
+import {
+    mkdir,
+    readFile,
+    writeFile,
+} from 'fs/promises';
+import {
+    basename,
+    dirname,
+    join,
+} from 'path';
+import rendy from 'rendy';
+
+export const writeRule = async (name, data) => {
+    await mkdir(`./lib`, {
+        recursive: true,
+    });
+    
+    await writeFile(`./lib/${name}.js`, data);
+};
+
+export const writeFixtures = async (name, data) => {
+    await mkdir(`./test/fixture`, {
+        recursive: true,
+    });
+    
+    await writeFile(`./test/fixture/${name}.js`, data);
+    await writeFile(`./test/fixture/${name}-fix.js`, data);
+};
+
+export const writeTests = async (name, report) => {
+    const templatePath = new URL('../../templates/plugin.js', import.meta.url).pathname;
+    const template = await readFile(templatePath, 'utf8');
+    const nestedPluginName = basename(dirname(join(process.cwd(), '..')));
+    const nested = nestedPluginName.replace('plugin-', '');
+    
+    await writeFile(`./test/${name}.js`, rendy(template, {
+        name,
+        nested,
+        report,
+        importPath: '..',
+    }));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redput",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "CLI tool to convert source from 🐊Putout Editor to files",
   "main": "lib/redput.js",
   "bin": {

package/templates/{nested.js → plugin.js}

@@ -1,5 +1,5 @@
 const {createTest} = require('@putout/test');
-const plugin = require('.');
+const plugin = require('{{ importPath }}');
 
 const test = createTest(__dirname, {
     printer: 'putout',