Solves orgapp#183 for packages/orga

packages/orga/src/parse/block.ts

@@ -1,23 +1,20 @@
 import { Action, Handler } from '.'
 import { BlockBegin, BlockEnd } from '../types'
 
-const block: Action = (
-  begin: BlockBegin,
-  { save, push, enter, lexer, attributes }
-): Handler => {
-  save()
+const block: Action = (begin: BlockBegin, context): Handler => {
+  context.save()
   const contentStart = begin.position.end
   const blockName = begin.name.toLowerCase()
 
-  const block = enter({
+  const block = context.enter({
     type: 'block',
     name: begin.name,
     params: begin.params,
     value: '',
-    attributes: { ...attributes },
+    attributes: { ...context.attributes },
     children: [],
   })
-  push(lexer.eat())
+  context.push(context.lexer.eat())
 
   /*
    * find the indentation of the block and apply it to
@@ -56,34 +53,33 @@ const block: Action = (
     rules: [
       {
         test: 'block.end',
-        action: (token: BlockEnd, { exit, push, lexer }) => {
-          const { eat } = lexer
+        action: (token: BlockEnd, context) => {
           if (token.name.toLowerCase() !== blockName) return 'next'
           block.value = align(
-            lexer.substring({
+            context.lexer.substring({
               start: contentStart,
               end: token.position.start,
             })
           )
-          push(eat())
-          eat('newline')
-          exit('block')
+          context.push(context.lexer.eat())
+          context.lexer.eat('newline')
+          context.exit('block')
           return 'break'
         },
       },
       {
         test: ['stars', 'EOF'],
-        action: (_, { restore, lexer }) => {
-          restore()
-          lexer.modify((t) => ({
+        action: (_, context) => {
+          context.restore()
+          context.lexer.modify((t) => ({
             type: 'text',
-            value: lexer.substring(t.position),
+            value: context.lexer.substring(t.position),
             position: t.position,
           }))
           return 'break'
         },
       },
-      { test: /./, action: (_, { push, lexer }) => push(lexer.eat()) },
+      { test: /./, action: (_, context) => context.push(context.lexer.eat()) },
     ],
   }
 }

packages/orga/src/parse/drawer.ts

@@ -2,16 +2,15 @@ import { Action } from '.'
 import { DrawerBegin, Section } from '../types'
 
 const drawer: Action = (begin: DrawerBegin, context) => {
-  const { save, enter, push, exit, lexer } = context
-  const { eat } = lexer
-  save()
-  const drawer = enter({
+  const lexer = context.lexer
+  context.save()
+  const drawer = context.enter({
     type: 'drawer',
     name: begin.name,
     value: '',
     children: [],
   })
-  push(eat())
+  context.push(lexer.eat())
 
   const contentStart = begin.position.end
 
@@ -20,30 +19,30 @@ const drawer: Action = (begin: DrawerBegin, context) => {
     rules: [
       {
         test: ['stars', 'EOF'],
-        action: (_, { restore, lexer }) => {
-          restore()
-          lexer.modify((t) => ({
+        action: (_, context) => {
+          context.restore()
+          context.lexer.modify((t) => ({
             type: 'text',
-            value: lexer.substring(t.position),
+            value: context.lexer.substring(t.position),
             position: t.position,
           }))
           return 'break'
         },
       },
       {
         test: 'drawer.end',
-        action: (token, { lexer, push, getParent }) => {
-          push(lexer.eat())
-          drawer.value = lexer.substring({
+        action: (token, context) => {
+          context.push(context.lexer.eat())
+          drawer.value = context.lexer.substring({
             start: contentStart,
             end: token.position.start,
           })
 
-          exit('drawer')
-          eat('newline')
+          context.exit('drawer')
+          lexer.eat('newline')
 
           if (drawer.name.toLowerCase() === 'properties') {
-            const section = getParent() as Section
+            const section = context.getParent() as Section
             section.properties = drawer.value
               .split('\n')
               .reduce((accu, current) => {

packages/orga/src/parse/latex.ts

@@ -1,21 +1,18 @@
 import { Action, Handler } from '.'
 import { LatexBegin, LatexEnd } from '../types'
 
-const latex: Action = (
-  begin: LatexBegin,
-  { save, push, enter, lexer }
-): Handler => {
-  save()
+const latex: Action = (begin: LatexBegin, context): Handler => {
+  context.save()
   const contentStart = begin.position.start
   const envName = begin.name.toLowerCase()
 
-  const latexBlock = enter({
+  const latexBlock = context.enter({
     type: 'latex',
     name: begin.name,
     value: '',
     children: [],
   })
-  push(lexer.eat())
+  context.push(context.lexer.eat())
 
   /*
    * find the indentation of the block and apply it to
@@ -49,28 +46,28 @@ const latex: Action = (
     rules: [
       {
         test: 'latex.end',
-        action: (token: LatexEnd, { exit, push, lexer }) => {
-          const { eat } = lexer
+        action: (token: LatexEnd, context) => {
+          const lexer = context.lexer
           if (token.name.toLowerCase() !== envName) return 'next'
           latexBlock.value = align(
             lexer.substring({
               start: contentStart,
               end: token.position.end,
             })
           )
-          push(eat())
-          eat('newline')
-          exit('latex')
+          context.push(lexer.eat())
+          lexer.eat('newline')
+          context.exit('latex')
           return 'break'
         },
       },
       {
         test: ['stars', 'EOF'],
-        action: (_, { restore, lexer }) => {
-          restore()
-          lexer.modify((t) => ({
+        action: (_, context) => {
+          context.restore()
+          context.lexer.modify((t) => ({
             type: 'text',
-            value: lexer.substring(t.position),
+            value: context.lexer.substring(t.position),
             position: t.position,
           }))
           return 'break'

packages/orga/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.esm.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist"

tsconfig.esm.json

@@ -11,5 +11,11 @@
     "allowJs": true,
     "lib": ["ES2020"]
   },
-  "exclude": ["node_modules", "**/*.spec.ts", "**/__tests__/**", "tests/**"]
+  "exclude": [
+    "node_modules",
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/__tests__/**",
+    "tests/**"
+  ]
 }