redput 1.12.0 → 1.14.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2023.11.28, v1.14.0
+
+feature:
+- daae14d redput: add ability to pass options
+
+2023.11.21, v1.13.0
+
+feature:
+- 8ecf9d3 redput: @putout/plugin-putout v16.7.0
+- afce39c redput: putout v33.9.1
+- 3a70560 redput: get-report: improve support of template literals
+
 2023.11.02, v1.12.0
 
 feature:

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

@@ -1,13 +1,14 @@
 import {
     operator,
     types,
+    print,
 } from 'putout';
 
 const {isStringLiteral} = types;
 const {getTemplateValues} = operator;
 
-const REPORT = 'export const report = () => __a';
-const REPORT_COMMONJS = 'module.exports.report = () => __a';
+const REPORT = 'export const report = (__args) => __a';
+const REPORT_COMMONJS = 'module.exports.report = (__args) => __a';
 const ASSIGN = 'export const report = __a';
 
 const templates = [
@@ -47,5 +48,9 @@ function parseValue(a) {
     if (isStringLiteral(a))
         return a.value;
     
-    return a.quasis[0].value.cooked;
+    const value = print(a);
+    
+    return value
+        .slice(1, -3)
+        .replaceAll('${', '{');
 }

package/lib/parse-plugin.js

@@ -1,11 +1,27 @@
+import tryCatch from 'try-catch';
+
+const {parse} = JSON;
+
 export const parsePlugin = (raw) => {
     const [comment, ...lines] = raw.split('\n');
-    const name = comment
-        .replace('//', '')
-        .trimStart();
+    const [options, name] = parseComment(comment);
     
     return {
         name,
         lines,
+        options,
     };
 };
+
+function parseComment(comment) {
+    const raw = comment
+        .replace('//', '')
+        .trimStart();
+    
+    const [error, data] = tryCatch(parse, raw);
+    
+    if (error)
+        return ['', raw];
+    
+    return [data[0], data[1]];
+}

package/lib/redput.js

@@ -21,17 +21,16 @@ export const redput = async (link, {token}) => {
     const raw = result.data.files['transform.js'].content;
     const fixture = result.data.files['source.js'].content;
     
-    const {name, lines} = parsePlugin(raw);
-    
-    if (name.includes(':') || name.includes('{'))
-        return [
-            Error(`Bad name: ${name}`),
-        ];
-    
+    const {
+        name,
+        options,
+        lines,
+    } = parsePlugin(raw);
     const rule = lines.join('\n');
     const report = getReport(rule);
     
     const [errorWrite] = await tryToCatch(writePlugin, name, {
+        options,
         rule,
         fixture,
         report,

package/lib/write/index.js

@@ -14,7 +14,7 @@ import {
 } from './simple.js';
 import tryToCatch from 'try-to-catch';
 
-export const writePlugin = async (name, {rule, fixture, report}) => {
+export const writePlugin = async (name, {rule, fixture, report, options}) => {
     const [isNested] = await tryToCatch(access, './package.json');
     
     if (isNested)
@@ -22,6 +22,7 @@ export const writePlugin = async (name, {rule, fixture, report}) => {
             rule,
             fixture,
             report,
+            options,
         });
     
     await writeSimple(name, {
@@ -31,18 +32,19 @@ export const writePlugin = async (name, {rule, fixture, report}) => {
     });
 };
 
-export const writeNested = async (name, {rule, fixture, report}) => {
-    await writeNestedRule(name, rule);
+export const writeNested = async (name, {rule, fixture, report, options}) => {
+    await writeNestedRule(name, rule, options);
     await writeNestedFixtures(name, fixture);
     await writeNestedTests(name, report);
     
     await tryToCatch(writeNestedOptional, name, {
+        options,
         fixture,
     });
 };
 
-export const writeNestedOptional = async (name, {fixture}) => {
-    await updateNestedIndex(name);
+export const writeNestedOptional = async (name, {options, fixture}) => {
+    await updateNestedIndex(name, options);
     await updateOverallNestedFixtures(name, fixture);
     await updateOverallNestedTest(name);
 };

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

@@ -3,11 +3,12 @@ import * as insertGetRulePlugin from './plugin-insert-get-rule/index.js';
 import pluginPutout from '@putout/plugin-putout';
 import removeUnusedVariables from '@putout/plugin-remove-unused-variables';
 
-export const addRule = (name, source) => {
+export const addRule = (name, source, ruleOptions) => {
     const {code} = putout(source, {
         rules: {
             'add-rule': ['on', {
                 name,
+                ruleOptions,
             }],
         },
         plugins: [

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

@@ -10,6 +10,7 @@ const {traverse} = operator;
 export const report = () => `Insert 'getRule()'`;
 
 const createRule = template('getRule(%%name%%)');
+const createRuleWithOptions = template('getRule(%%name%%, "off")');
 
 export const match = ({options}) => ({
     'module.exports.rules = __object': ({__object}) => {
@@ -20,6 +21,9 @@ export const match = ({options}) => ({
             [`getRule('${name}')`]: () => {
                 exists = true;
             },
+            [`getRule('${name}', 'off')`]: () => {
+                exists = true;
+            },
         });
         
         return !exists;
@@ -28,7 +32,17 @@ export const match = ({options}) => ({
 
 export const replace = ({options}) => ({
     'module.exports.rules = __object': ({__object}, path) => {
-        const {name} = options;
+        const {name, ruleOptions} = options;
+        
+        if (ruleOptions) {
+            const node = SpreadElement(createRuleWithOptions({
+                name: StringLiteral(name),
+            }));
+            
+            __object.properties.push(node);
+            return path;
+        }
+        
         const node = SpreadElement(createRule({
             name: StringLiteral(name),
         }));

package/lib/write/nested/nested.js

@@ -47,9 +47,9 @@ export const writeNestedTests = async (name, report) => {
     }));
 };
 
-export const updateNestedIndex = async (name) => {
+export const updateNestedIndex = async (name, options) => {
     const source = await readFile('./index.js', 'utf8');
-    const code = addRule(name, source);
+    const code = addRule(name, source, options);
     await writeFile(`./index.js`, code);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redput",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "CLI tool to convert source from 🐊Putout Editor to files",
   "main": "lib/redput.js",
   "bin": {
@@ -59,12 +59,13 @@
   "dependencies": {
     "@putout/plugin-convert-esm-to-commonjs": "^6.0.0",
     "@putout/plugin-declare": "^2.0.1",
-    "@putout/plugin-putout": "^15.1.0",
+    "@putout/plugin-putout": "^16.7.0",
     "@putout/plugin-remove-unused-variables": "^7.0.0",
     "node-fetch": "^3.3.2",
     "octokit": "^3.1.0",
-    "putout": "^32.0.1",
+    "putout": "^33.9.1",
     "rendy": "^4.1.3",
+    "try-catch": "^3.0.1",
     "try-to-catch": "^3.0.1"
   },
   "devDependencies": {