comparing v3.0.1 and main on kitten.sh/reghex

+26

.github/workflows/mirror.yml

···

       1
       1
       +
       # Mirrors to https://tangled.sh/@kitten.sh (knot.kitten.sh)

     

       2
       2
       +
       name: Mirror (Git Backup)

     

       3
       3
       +
       on:

     

       4
       4
       +
         push:

     

       5
       5
       +
           branches:

     

       6
       6
       +
             - main

     

       7
       7
       +
       jobs:

     

       8
       8
       +
         mirror:

     

       9
       9
       +
           runs-on: ubuntu-latest

     

       10
       10
       +
           steps:

     

       11
       11
       +
             - name: Checkout repository

     

       12
       12
       +
               uses: actions/checkout@v4

     

       13
       13
       +
               with:

     

       14
       14
       +
                 fetch-depth: 0

     

       15
       15
       +
                 fetch-tags: true

     

       16
       16
       +
             - name: Mirror

     

       17
       17
       +
               env:

     

       18
       18
       +
                 MIRROR_SSH_KEY: ${{ secrets.MIRROR_SSH_KEY }}

     

       19
       19
       +
                 GIT_SSH_COMMAND: 'ssh -o StrictHostKeyChecking=yes'

     

       20
       20
       +
               run: |

     

       21
       21
       +
                 mkdir -p ~/.ssh

     

       22
       22
       +
                 echo "$MIRROR_SSH_KEY" > ~/.ssh/id_rsa

     

       23
       23
       +
                 chmod 600 ~/.ssh/id_rsa

     

       24
       24
       +
                 ssh-keyscan -H knot.kitten.sh >> ~/.ssh/known_hosts

     

       25
       25
       +
                 git remote add mirror "git@knot.kitten.sh:kitten.sh/${GITHUB_REPOSITORY#*/}"

     

       26
       26
       +
                 git push --mirror mirror

+1 -1

package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "reghex",

     

       3
       3
       -
         "version": "3.0.1",

     

       3
       3
       +
         "version": "3.0.2",

     

       4
       4
        
         "description": "The magical sticky regex-based parser generator 🧙",

     

       5
       5
        
         "author": "Phil Pluckthun <phil@kitten.sh>",

     

       6
       6
        
         "license": "MIT",

+123 -22

src/babel/__snapshots__/plugin.test.js.snap

···

       30
       30
        
           return;

     

       31
       31
        
         }

     

       32
       32
        
       

     

       33
       33
       -
         node.tag = 'a';

     

       33
       33
       +
         if ('a') node.tag = 'a';

     

       34
       34
        
         return node;

     

       35
       35
        
       };

     

       36
       36
        
       

     
···

       58
       58
        
           return;

     

       59
       59
        
         }

     

       60
       60
        
       

     

       61
       61
       -
         node.tag = 'b';

     

       61
       61
       +
         if ('b') node.tag = 'b';

     

       62
       62
        
         return node;

     

       63
       63
        
       };"

     

       64
       64
        
       `;

     
···

       93
       93
        
           return;

     

       94
       94
        
         }

     

       95
       95
        
       

     

       96
       96
       -
         node.tag = 'node';

     

       96
       96
       +
         if ('node') node.tag = 'node';

     

       97
       97
        
         return node;

     

       98
       98
        
       };"

     

       99
       99
        
       `;

     
···

       122
       122
        
           return;

     

       123
       123
        
         }

     

       124
       124
        
       

     

       125
       125
       -
         node.tag = 'inner';

     

       125
       125
       +
         if ('inner') node.tag = 'inner';

     

       126
       126
        
         return node;

     

       127
       127
        
       };

     

       128
       128
        
       

     
···

       140
       140
        
           return;

     

       141
       141
        
         }

     

       142
       142
        
       

     

       143
       143
       -
         node.tag = 'node';

     

       143
       143
       +
         if ('node') node.tag = 'node';

     

       144
       144
       +
         return node;

     

       145
       145
       +
       };"

     

       146
       146
       +
       `;

     

       147
       147
       +
       

     

       148
       148
       +
       exports[`works with nameless matchers 1`] = `

     

       149
       149
       +
       "import { match, __pattern as _pattern } from \\"reghex\\";

     

       150
       150
       +
       

     

       151
       151
       +
       var _objectObject_expression = _pattern(1),

     

       152
       152
       +
           _objectObject_expression2 = _pattern(2),

     

       153
       153
       +
           _objectObject_expression3 = _pattern(3),

     

       154
       154
       +
           _objectObject_expression4 = _pattern(4),

     

       155
       155
       +
           _objectObject_expression5 = _pattern(5);

     

       156
       156
       +
       

     

       157
       157
       +
       const node = function (state) {

     

       158
       158
       +
         var y1 = state.y,

     

       159
       159
       +
             x1 = state.x;

     

       160
       160
       +
         var node = [];

     

       161
       161
       +
         var x;

     

       162
       162
       +
       

     

       163
       163
       +
         alt_2: {

     

       164
       164
       +
           block_2: {

     

       165
       165
       +
             var y2 = state.y,

     

       166
       166
       +
                 x2 = state.x;

     

       167
       167
       +
       

     

       168
       168
       +
             if ((x = _objectObject_expression(state)) != null) {

     

       169
       169
       +
               node.push(x);

     

       170
       170
       +
             } else {

     

       171
       171
       +
               state.y = y2;

     

       172
       172
       +
               state.x = x2;

     

       173
       173
       +
               break block_2;

     

       174
       174
       +
             }

     

       175
       175
       +
       

     

       176
       176
       +
             group_2: for (;;) {

     

       177
       177
       +
               var y2 = state.y,

     

       178
       178
       +
                   x2 = state.x;

     

       179
       179
       +
       

     

       180
       180
       +
               if ((x = _objectObject_expression(state)) != null) {

     

       181
       181
       +
                 node.push(x);

     

       182
       182
       +
               } else {

     

       183
       183
       +
                 state.y = y2;

     

       184
       184
       +
                 state.x = x2;

     

       185
       185
       +
                 break group_2;

     

       186
       186
       +
               }

     

       187
       187
       +
             }

     

       188
       188
       +
       

     

       189
       189
       +
             break alt_2;

     

       190
       190
       +
           }

     

       191
       191
       +
       

     

       192
       192
       +
           if ((x = _objectObject_expression2(state)) != null) {

     

       193
       193
       +
             node.push(x);

     

       194
       194
       +
           } else {

     

       195
       195
       +
             state.y = y1;

     

       196
       196
       +
             state.x = x1;

     

       197
       197
       +
             return;

     

       198
       198
       +
           }

     

       199
       199
       +
       

     

       200
       200
       +
           group_2: for (;;) {

     

       201
       201
       +
             var y2 = state.y,

     

       202
       202
       +
                 x2 = state.x;

     

       203
       203
       +
       

     

       204
       204
       +
             if ((x = _objectObject_expression2(state)) != null) {

     

       205
       205
       +
               node.push(x);

     

       206
       206
       +
             } else {

     

       207
       207
       +
               state.y = y2;

     

       208
       208
       +
               state.x = x2;

     

       209
       209
       +
               break group_2;

     

       210
       210
       +
             }

     

       211
       211
       +
           }

     

       212
       212
       +
       

     

       213
       213
       +
           group_2: for (;;) {

     

       214
       214
       +
             var y2 = state.y,

     

       215
       215
       +
                 x2 = state.x;

     

       216
       216
       +
             var ln2 = node.length;

     

       217
       217
       +
       

     

       218
       218
       +
             if ((x = _objectObject_expression3(state)) != null) {

     

       219
       219
       +
               node.push(x);

     

       220
       220
       +
             } else {

     

       221
       221
       +
               state.y = y2;

     

       222
       222
       +
               state.x = x2;

     

       223
       223
       +
               node.length = ln2;

     

       224
       224
       +
               break group_2;

     

       225
       225
       +
             }

     

       226
       226
       +
       

     

       227
       227
       +
             var y4 = state.y,

     

       228
       228
       +
                 x4 = state.x;

     

       229
       229
       +
       

     

       230
       230
       +
             if ((x = _objectObject_expression4(state)) != null) {

     

       231
       231
       +
               node.push(x);

     

       232
       232
       +
             } else {

     

       233
       233
       +
               state.y = y4;

     

       234
       234
       +
               state.x = x4;

     

       235
       235
       +
             }

     

       236
       236
       +
       

     

       237
       237
       +
             if ((x = _objectObject_expression5(state)) != null) {

     

       238
       238
       +
               node.push(x);

     

       239
       239
       +
             } else {

     

       240
       240
       +
               state.y = y2;

     

       241
       241
       +
               state.x = x2;

     

       242
       242
       +
               node.length = ln2;

     

       243
       243
       +
               break group_2;

     

       244
       244
       +
             }

     

       245
       245
       +
           }

     

       246
       246
       +
         }

     

       247
       247
       +
       

     

       248
       248
       +
         if (null) node.tag = null;

     

       144
       249
        
         return node;

     

       145
       250
        
       };"

     

       146
       251
        
       `;

     
···

       204
       309
        
           }

     

       205
       310
        
         }

     

       206
       311
        
       

     

       207
       207
       -
         node.tag = 'node';

     

       312
       312
       +
         if ('node') node.tag = 'node';

     

       208
       313
        
         return node;

     

       209
       314
        
       };"

     

       210
       315
        
       `;

     
···

       226
       331
        
           return;

     

       227
       332
        
         }

     

       228
       333
        
       

     

       229
       229
       -
         node.tag = 'inner';

     

       334
       334
       +
         if ('inner') node.tag = 'inner';

     

       230
       335
        
         return node;

     

       231
       336
        
       };

     

       232
       337
        
       

     
···

       244
       349
        
           return;

     

       245
       350
        
         }

     

       246
       351
        
       

     

       247
       247
       -
         node.tag = 'node';

     

       352
       352
       +
         if ('node') node.tag = 'node';

     

       248
       353
        
         return node;

     

       249
       354
        
       };"

     

       250
       355
        
       `;

     
···

       328
       433
        
               break group_2;

     

       329
       434
        
             }

     

       330
       435
        
       

     

       331
       331
       -
             group_4: {

     

       332
       332
       -
               var y4 = state.y,

     

       333
       333
       -
                   x4 = state.x;

     

       436
       436
       +
             var y4 = state.y,

     

       437
       437
       +
                 x4 = state.x;

     

       334
       438
        
       

     

       335
       335
       -
               if ((x = _node_expression4(state)) != null) {

     

       336
       336
       -
                 node.push(x);

     

       337
       337
       -
               } else {

     

       338
       338
       -
                 state.y = y4;

     

       339
       339
       -
                 state.x = x4;

     

       340
       340
       -
                 node.length = ln2;

     

       341
       341
       -
                 break group_4;

     

       342
       342
       -
               }

     

       439
       439
       +
             if ((x = _node_expression4(state)) != null) {

     

       440
       440
       +
               node.push(x);

     

       441
       441
       +
             } else {

     

       442
       442
       +
               state.y = y4;

     

       443
       443
       +
               state.x = x4;

     

       343
       444
        
             }

     

       344
       445
        
       

     

       345
       446
        
             if ((x = _node_expression5(state)) != null) {

     
···

       353
       454
        
           }

     

       354
       455
        
         }

     

       355
       456
        
       

     

       356
       356
       -
         node.tag = 'node';

     

       457
       457
       +
         if ('node') node.tag = 'node';

     

       357
       458
        
         return node;

     

       358
       459
        
       };"

     

       359
       460
        
       `;

     
···

       368
       469
        
             x1 = state.x;

     

       369
       470
        
         var node = [];

     

       370
       471
        
         var x;

     

       371
       371
       -
         node.tag = 'inner';

     

       472
       472
       +
         if ('inner') node.tag = 'inner';

     

       372
       473
        
         return _inner_transform(node);

     

       373
       474
        
       };

     

       374
       475
        
       

     
···

       379
       480
        
             x1 = state.x;

     

       380
       481
        
         var node = [];

     

       381
       482
        
         var x;

     

       382
       382
       -
         node.tag = 'node';

     

       483
       483
       +
         if ('node') node.tag = 'node';

     

       383
       484
        
         return transform(node);

     

       384
       485
        
       };"

     

       385
       486
        
       `;

+15

src/babel/plugin.test.js

···

       16
       16
        
         ).toMatchSnapshot();

     

       17
       17
        
       });

     

       18
       18
        
       

     

       19
       19
       +
       it('works with nameless matchers', () => {

     

       20
       20
       +
         const code = `

     

       21
       21
       +
           import { match } from 'reghex/macro';

     

       22
       22
       +
       

     

       23
       23
       +
           const node = match()\`

     

       24
       24
       +
             \${1}+ | \${2}+ (\${3} ( \${4}? \${5} ) )*

     

       25
       25
       +
           \`;

     

       26
       26
       +
         `;

     

       27
       27
       +
       

     

       28
       28
       +
         expect(

     

       29
       29
       +
           transform(code, { babelrc: false, presets: [], plugins: [reghexPlugin] })

     

       30
       30
       +
             .code

     

       31
       31
       +
         ).toMatchSnapshot();

     

       32
       32
       +
       });

     

       33
       33
       +
       

     

       19
       34
        
       it('works while only minifying', () => {

     

       20
       35
        
         const code = `

     

       21
       36
        
           import { match } from 'reghex/macro';

+12 -22

src/babel/transform.js

···

       83
       83
        
           getMatchName(path) {

     

       84
       84
        
             t.assertTaggedTemplateExpression(path.node);

     

       85
       85
        
             const nameArgumentPath = path.get('tag.arguments.0');

     

       86
       86
       -
             const { confident, value } = nameArgumentPath.evaluate();

     

       87
       87
       -
             if (!confident && t.isIdentifier(nameArgumentPath.node)) {

     

       88
       88
       -
               return nameArgumentPath.node.name;

     

       89
       89
       -
             } else if (confident && typeof value === 'string') {

     

       90
       90
       -
               return value;

     

       91
       91
       -
             } else {

     

       92
       92
       -
               return path.scope.generateUidIdentifierBasedOnNode(path.node);

     

       86
       86
       +
             if (nameArgumentPath) {

     

       87
       87
       +
               const { confident, value } = nameArgumentPath.evaluate();

     

       88
       88
       +
               if (!confident && t.isIdentifier(nameArgumentPath.node)) {

     

       89
       89
       +
                 return nameArgumentPath.node.name;

     

       90
       90
       +
               } else if (confident && typeof value === 'string') {

     

       91
       91
       +
                 return value;

     

       92
       92
       +
               }

     

       93
       93
        
             }

     

       94
       94
       +
       

     

       95
       95
       +
             return path.scope.generateUidIdentifierBasedOnNode(path.node);

     

       94
       96
        
           },

     

       95
       97
        
       

     

       96
       98
        
           /** Given a match, hoists its expressions in front of the match's statement */

     
···

       194
       196
        
           },

     

       195
       197
        
       

     

       196
       198
        
           minifyMatch(path) {

     

       197
       197
       -
             if (!path.node.tag.arguments.length) {

     

       198
       198
       -
               throw path

     

       199
       199
       -
                 .get('tag')

     

       200
       200
       -
                 .buildCodeFrameError(

     

       201
       201
       -
                   'match() must at least be called with a node name'

     

       202
       202
       -
                 );

     

       203
       203
       -
             }

     

       204
       204
       -
       

     

       205
       199
        
             const quasis = path.node.quasi.quasis.map((x) =>

     

       206
       200
        
               t.stringLiteral(x.value.cooked.replace(/\s*/g, ''))

     

       207
       201
        
             );

     
···

       217
       211
        
           },

     

       218
       212
        
       

     

       219
       213
        
           transformMatch(path) {

     

       220
       220
       -
             if (!path.node.tag.arguments.length) {

     

       221
       221
       -
               throw path

     

       222
       222
       -
                 .get('tag')

     

       223
       223
       -
                 .buildCodeFrameError(

     

       224
       224
       -
                   'match() must at least be called with a node name'

     

       225
       225
       -
                 );

     

       214
       214
       +
             let name = path.node.tag.arguments[0];

     

       215
       215
       +
             if (!name) {

     

       216
       216
       +
               name = t.nullLiteral();

     

       226
       217
        
             }

     

       227
       218
        
       

     

       228
       228
       -
             const name = path.node.tag.arguments[0];

     

       229
       219
        
             const quasis = path.node.quasi.quasis.map((x) => x.value.cooked);

     

       230
       220
        
       

     

       231
       221
        
             const expressions = this._prepareExpressions(path);

+9 -1

src/codegen.js

···

       98
       98
        
               ${astChild(ast, depth, opts)}

     

       99
       99
        
             }

     

       100
       100
        
           `;

     

       101
       101
       +
         } else if (ast.quantifier === '?' && ast.expression) {

     

       102
       102
       +
           opts.index = depth;

     

       103
       103
       +
           opts.abort = '';

     

       104
       104
       +
       

     

       105
       105
       +
           child = js`

     

       106
       106
       +
             ${assignIndex(depth)}

     

       107
       107
       +
             ${astChild(ast, depth, opts)}

     

       108
       108
       +
           `;

     

       101
       109
        
         } else if (ast.quantifier === '?') {

     

       102
       110
        
           opts.index = depth;

     

       103
       111
        
           opts.abort = js`break ${group}`;

     
···

       186
       194
        
               capture: true,

     

       187
       195
        
             })}

     

       188
       196
        
       

     

       189
       189
       -
             ${_node}.tag = ${name};

     

       197
       197
       +
             if (${name}) ${_node}.tag = ${name};

     

       190
       198
        
             return ${transform ? js`(${transform})(${_node})` : _node};

     

       191
       199
        
           })

     

       192
       200
        
         `;

src/core.test.js

···

       15
       15
        
         }

     

       16
       16
        
       };

     

       17
       17
        
       

     

       18
       18
       +
       describe('can create nameless matchers', () => {

     

       19
       19
       +
         it('matches without tagging', () => {

     

       20
       20
       +
           const state = { quasis: ['1'], expressions: [], x: 0, y: 0 };

     

       21
       21
       +
           const node = match(null)`${/1/}`;

     

       22
       22
       +
           expect(node(state)).toEqual(['1']);

     

       23
       23
       +
         });

     

       24
       24
       +
       });

     

       25
       25
       +
       

     

       18
       26
        
       describe('required matcher', () => {

     

       19
       27
        
         const node = match('node')`${/1/}`;

     

       20
       28
        
         it.each`

Compare changes