redput 1.2.1 → 1.4.0

package/ChangeLog

@@ -1,3 +1,18 @@
+2023.08.16, v1.4.0
+
+feature:
+- 6812e73 redput: prepare rule before write
+- 49939c1 write: nested: convert to commonjs
+- 52145ff write: nested: optional
+
+2023.08.16, v1.3.0
+
+feature:
+- 90f4471 redput: nested: update overall test
+- a78d8d4 redput: move add-rule
+- 095ccdf redput: nested: update index.js
+- 08146ac redput: plugin-insert-get-rule: simplify
+
 2023.08.14, v1.2.1
 
 fix:

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

@@ -33,10 +33,6 @@ export const traverse = ({push}) => {
 
 const process = ({push, template}) => (path) => {
     const {__a} = getTemplateValues(path, template);
-    
-    if (!__a)
-        return;
-    
     const value = parseValue(__a);
     
     push({

package/lib/redput.js

@@ -1,6 +1,4 @@
 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 {writePlugin} from './write/index.js';
@@ -34,12 +32,14 @@ export const redput = async (link, {token}) => {
     const rule = lines.join('\n');
     const report = getReport(rule);
     
-    await writePlugin(name, {
+    const [errorWrite] = await tryToCatch(writePlugin, name, {
         rule,
         fixture,
         report,
     });
     
+    if (errorWrite)
+        return [errorWrite];
+    
     return SUCCESS;
 };
-

package/lib/write/index.js

@@ -1,20 +1,12 @@
-import rendy from 'rendy';
-import {
-    readFile,
-    writeFile,
-    mkdir,
-    access,
-} from 'fs/promises';
-import {
-    dirname,
-    basename,
-    join,
-} from 'path';
+import {access} from 'fs/promises';
 import {
+    updateNestedIndex,
+    updateOverallNestedFixtures,
+    updateOverallNestedTest,
     writeNestedFixtures,
     writeNestedRule,
     writeNestedTests,
-} from './nested.js';
+} from './nested/nested.js';
 import {
     writeFixtures,
     writeRule,
@@ -25,13 +17,12 @@ import tryToCatch from 'try-to-catch';
 export const writePlugin = async (name, {rule, fixture, report}) => {
     const [isNested] = await tryToCatch(access, './package.json');
     
-    if (isNested) {
+    if (isNested)
         return await writeNested(name, {
             rule,
             fixture,
             report,
         });
-    }
     
     await writeSimple(name, {
         rule,
@@ -44,6 +35,16 @@ export const writeNested = async (name, {rule, fixture, report}) => {
     await writeNestedRule(name, rule);
     await writeNestedFixtures(name, fixture);
     await writeNestedTests(name, report);
+    
+    await tryToCatch(writeNestedOptional, name, {
+        fixture,
+    });
+};
+
+export const writeNestedOptional = async (name, {fixture}) => {
+    await updateNestedIndex(name);
+    await updateOverallNestedFixtures(name, fixture);
+    await updateOverallNestedTest(name);
 };
 
 export const writeSimple = async (name, {rule, fixture, report}) => {

package/lib/write/nested/add-rule/plugin-insert-get-rule/index.js

@@ -0,0 +1,40 @@
+import {
+    types,
+    operator,
+    template,
+} from 'putout';
+
+const {StringLiteral, SpreadElement} = types;
+const {traverse} = operator;
+
+export const report = () => `Insert 'getRule()'`;
+
+const createRule = template('getRule(%%name%%)');
+
+export const match = ({options}) => ({
+    'module.exports.rules = __object': ({__object}) => {
+        let exists = false;
+        const {name} = options;
+        
+        traverse(__object, {
+            [`getRule('${name}')`]: () => {
+                exists = true;
+            },
+        });
+        
+        return !exists;
+    },
+});
+
+export const replace = ({options}) => ({
+    'module.exports.rules = __object': ({__object}, path) => {
+        const {name} = options;
+        const node = SpreadElement(createRule({
+            name: StringLiteral(name),
+        }));
+        
+        __object.properties.push(node);
+        
+        return path;
+    },
+});

package/lib/write/nested/insert-test/insert-test.js

@@ -0,0 +1,18 @@
+import putout from 'putout';
+import * as insertTestPlugin from './plugin-insert-test/index.js';
+
+export const insertTest = (rule, plugin, source) => {
+    const {code} = putout(source, {
+        rules: {
+            'insert-test': ['on', {
+                rule,
+                plugin,
+            }],
+        },
+        plugins: [
+            ['insert-test', insertTestPlugin],
+        ],
+    });
+    
+    return code;
+};

package/lib/write/nested/insert-test/plugin-insert-test/index.js

@@ -0,0 +1,31 @@
+import {template} from 'putout';
+
+export const report = () => 'Insert test';
+
+export const fix = ({path, nodeTest}) => {
+    path.node.body.push(nodeTest);
+};
+
+export const traverse = ({push, pathStore, options}) => {
+    const {plugin = 'github', rule = 'insert-test'} = options;
+    const strTest = `
+        test('plugin-${plugin}: transform: ${rule}', (t) => {
+            t.transform('${rule}');
+            t.end();
+        });
+    `;
+    
+    const nodeTest = template.ast(strTest);
+    
+    return {
+        [strTest]: pathStore,
+        Program: {
+            exit(path) {
+                !pathStore().length && push({
+                    path,
+                    nodeTest,
+                });
+            },
+        },
+    };
+};

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

@@ -9,6 +9,8 @@ import {
     join,
 } from 'path';
 import rendy from 'rendy';
+import {addRule} from './add-rule/add-rule.js';
+import {insertTest} from './insert-test/insert-test.js';
 
 export const writeNestedRule = async (name, data) => {
     await mkdir(`./${name}`, {
@@ -28,7 +30,7 @@ export const writeNestedFixtures = async (name, data) => {
 };
 
 export const writeNestedTests = async (name, report) => {
-    const templatePath = new URL('../../templates/plugin.js', import.meta.url).pathname;
+    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-', '');
@@ -40,3 +42,24 @@ export const writeNestedTests = async (name, report) => {
         importPath: '.',
     }));
 };
+
+export const updateNestedIndex = async (name) => {
+    const source = await readFile('./index.js', 'utf8');
+    const code = addRule(name, source);
+    await writeFile(`./index.js`, code);
+};
+
+export const updateOverallNestedTest = async (name) => {
+    const nestedPluginName = basename(dirname(join(process.cwd())));
+    const plugin = nestedPluginName.replace('plugin-', '');
+    
+    const source = await readFile(`../test/${plugin}.js`, 'utf8');
+    const code = insertTest(name, plugin, source);
+    
+    await writeFile(`../test/${plugin}.js`, code);
+};
+
+export const updateOverallNestedFixtures = async (name, data) => {
+    await writeFile(`../test/fixture/${name}.js`, data);
+    await writeFile(`../test/fixture/${name}-fix.js`, data);
+};

package/lib/write/nested/prepare-rule/prepare-rule.js

@@ -0,0 +1,13 @@
+import putout from 'putout';
+
+export const prepareRule = (source) => {
+    const {code} = putout(source, {
+        plugins: [
+            'declare',
+            'convert-esm-to-commonjs',
+            'putout',
+        ],
+    });
+    
+    return code;
+};

package/package.json

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

package/lib/add-rule/plugin-insert-get-rule/index.js

@@ -1,47 +0,0 @@
-import {
-    operator,
-    types,
-    template,
-} from 'putout';
-
-const {getTemplateValues} = operator;
-const {StringLiteral, SpreadElement} = types;
-const RULES = 'module.exports.rules = __object';
-const GET_RULE = template('getRule(%%name%%)');
-
-export const report = () => `Insert 'getRule()'`;
-
-export const fix = ({__object}, {options}) => {
-    const {name} = options;
-    const getRuleNode = SpreadElement(GET_RULE({
-        name: StringLiteral(name),
-    }));
-    
-    __object.properties.push(getRuleNode);
-};
-
-export const traverse = ({push, options}) => ({
-    [RULES](path) {
-        const {__object} = getTemplateValues(path, RULES);
-        const {name} = options;
-        
-        if (!check(name, __object))
-            return;
-        
-        push({
-            path,
-            __object,
-        });
-    },
-});
-
-function check(name, {properties}) {
-    for (const {argument} of properties) {
-        const [first] = argument.arguments;
-        
-        if (first.value === name)
-            return false;
-    }
-    
-    return true;
-}