Skip to content

Commit

Permalink
fix(esm): use babel imports
Browse files Browse the repository at this point in the history
  • Loading branch information
kollhof committed Oct 6, 2020
1 parent 6d97beb commit aa3183a
Show file tree
Hide file tree
Showing 36 changed files with 78 additions and 39 deletions.
4 changes: 3 additions & 1 deletion src/generate.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{default: traverse} = import '@babel/traverse'
babel_traverse = import '@babel/traverse'
{default: traverse} = babel_traverse

{transformFromAstSync} = import '@babel/core'
{is_empty} = import '@fink/std-lib/iter.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/js/async.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{isArrowFunctionExpression, isFunctionExpression, isForOfStatement} = import '@babel/types'
babel_types = import '@babel/types'
{isArrowFunctionExpression, isFunctionExpression, isForOfStatement} = babel_types
{set_props} = import '@fink/js-interop/reflect.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/js/do-expression.fnk
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
babel_types = import '@babel/types'
{
assignmentExpression, returnStatement, expressionStatement
isDoExpression, isBlockStatement, isLabeledStatement
isVariableDeclarator, isArrowFunctionExpression, isExpressionStatement
isReturnStatement, arrowFunctionExpression, callExpression
} = import '@babel/types'
} = babel_types
{set_props} = import '@fink/js-interop/reflect.fnk'
{undefined} = import '@fink/js-interop/nullish.fnk'
{is_empty} = import '@fink/std-lib/iter.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/js/left.fnk
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
babel_types = import '@babel/types'
{
isAssignmentExpression, assignmentPattern, isSpreadElement, restElement
isArrayExpression, arrayPattern, isObjectExpression, objectPattern
} = import '@babel/types'
} = babel_types


transform_left = fn val:
Expand Down
3 changes: 2 additions & 1 deletion src/js/module.fnk
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
babel_types = import '@babel/types'
{
identifier, assignmentExpression, expressionStatement
memberExpression, callExpression, objectProperty, objectPattern
variableDeclaration, variableDeclarator
isImportDefaultSpecifier, isImportSpecifier
} = import '@babel/types'
} = babel_types


[no_result] = []
Expand Down
11 changes: 7 additions & 4 deletions src/js/types.fnk
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
babe_types = import '@babel/types'
{is_empty} = import '@fink/std-lib/iter.fnk'


{escape_ident} = import'./identifier.fnk'

{
variableDeclaration, variableDeclarator
forOfStatement, yieldExpression, nullLiteral, booleanLiteral
expressionStatement, functionExpression
blockStatement, identifier, arrowFunctionExpression
logicalExpression, binaryExpression, unaryExpression
doExpression, assignmentExpression, isIdentifier
} = import'@babel/types'
{is_empty} = import '@fink/std-lib/iter.fnk'
} = babe_types


{escape_ident} = import'./identifier.fnk'


wrap = fn larix_node, js_node:
{...js_node, loc: larix_node.loc}
Expand Down
3 changes: 2 additions & 1 deletion src/lang/arithmitic/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{binaryExpression, unaryExpression} = import '@babel/types'
babel_types = import '@babel/types'
{binaryExpression, unaryExpression} = babel_types
{add, any} = import '../context.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/assignment/init.fnk
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
babel_types = import '@babel/types'
{
blockStatement, variableDeclaration, variableDeclarator, doExpression
arrayExpression, assignmentExpression, callExpression
memberExpression, identifier, expressionStatement, arrayPattern, restElement
numericLiteral
} = import '@babel/types'
} = babel_types
{length, is_empty} = import '@fink/std-lib/iter.fnk'
{wrap_with_comment_loc} = import '../comments/init.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/async/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{awaitExpression} = import '@babel/types'
babel_types = import '@babel/types'
{awaitExpression} = babel_types
{add, any} = import '../context.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/block/init.fnk
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
babel_types = import '@babel/types'
{
doExpression, blockStatement, isAssignmentExpression, expressionStatement
variableDeclaration, variableDeclarator
} = import '@babel/types'
} = babel_types
{length} = import '@fink/std-lib/iter.fnk'

{add, any} = import '../context.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/call/call.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{callExpression, identifier} = import '@babel/types'
babel_types = import '@babel/types'
{callExpression, identifier} = babel_types
{is_empty, length} = import '@fink/std-lib/iter.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/call/pipe.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{callExpression} = import '@babel/types'
babel_types = import '@babel/types'
{callExpression} = babel_types
{is_empty} = import '@fink/std-lib/iter.fnk'

{assign, lets, expr_block, undef} = import '../../js/types.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/comparison/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{binaryExpression, logicalExpression} = import '@babel/types'
babel_types = import '@babel/types'
{binaryExpression, logicalExpression} = babel_types

{add, any} = import '../context.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/conditionals/match.fnk
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
babel_types = import '@babel/types'
{
blockStatement, breakStatement, labeledStatement, objectPattern
objectProperty, expressionStatement, ifStatement
doExpression, stringLiteral, memberExpression, restElement
identifier
} = import '@babel/types'
} = babel_types
{length, is_empty} = import '@fink/std-lib/iter.fnk'

{and, eq, not_nullish, typof, consts} = import '../../js/types.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/func/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{arrowFunctionExpression} = import '@babel/types'
babel_types = import '@babel/types'
{arrowFunctionExpression} = babel_types

{transform_left} = import '../../js/left.fnk'
{add, any} = import '../context.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/identifier/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{identifier} = import '@babel/types'
babel_types = import '@babel/types'
{identifier} = babel_types

{escape_ident} = import '../../js/identifier.fnk'
{add, any} = import '../context.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/iterable/filter.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ifStatement} = import '@babel/types'
babel_types = import '@babel/types'
{ifStatement} = babel_types

{generator, for_of, yields} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/iterable/find.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{returnStatement, ifStatement} = import '@babel/types'
babel_types = import '@babel/types'
{returnStatement, ifStatement} = babel_types

{func, for_of, undef} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/iterable/unfold.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{whileStatement, blockStatement} = import '@babel/types'
babel_types = import '@babel/types'
{whileStatement, blockStatement} = babel_types
{is_empty} = import '@fink/std-lib/iter.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/iterable/until.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{returnStatement, ifStatement} = import '@babel/types'
babel_types = import '@babel/types'
{returnStatement, ifStatement} = babel_types

{generator, for_of, yields, eq, true_} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/iterable/while.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{returnStatement, ifStatement} = import '@babel/types'
babel_types = import '@babel/types'
{returnStatement, ifStatement} = babel_types

{generator, for_of, yields, neq, true_} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/js-compat/throw.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{unaryExpression} = import '@babel/types'
babel_types = import '@babel/types'
{unaryExpression} = babel_types
{wrap} = import '../../js/types.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/js-compat/try.fnk
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
babel_types = import '@babel/types'
{
tryStatement, blockStatement, catchClause, arrayExpression
expressionStatement, doExpression, isDoExpression
} = import '@babel/types'
} = babel_types

{false_} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/jsx/init.fnk
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
babel_types = import '@babel/types'
{
jsxElement, jsxOpeningElement, jsxIdentifier, jsxClosingElement, jsxAttribute
stringLiteral, jsxExpressionContainer, jsxText, jsxFragment, jsxOpeningFragment
jsxClosingFragment
} = import '@babel/types'
} = babel_types
{add, any} = import '../context.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/literals/array.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{arrayExpression} = import '@babel/types'
babel_types = import '@babel/types'
{arrayExpression} = babel_types
{null} = import '@fink/js-interop/nullish.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/literals/keywords.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{booleanLiteral} = import '@babel/types'
babel_types = import '@babel/types'
{booleanLiteral} = babel_types


transform_keyword = fn node:
Expand Down
3 changes: 2 additions & 1 deletion src/lang/literals/number.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{numericLiteral} = import '@babel/types'
babel_types = import '@babel/types'
{numericLiteral} = babel_types
{rx, matches} = import '@fink/std-lib/regex.fnk'
{parse_float, parse_int} = import '@fink/std-lib/num.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/literals/object.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{objectExpression, objectProperty, assignmentPattern} = import '@babel/types'
babel_types = import '@babel/types'
{objectExpression, objectProperty, assignmentPattern} = babel_types

{raw_str} = import '../../js/types.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/literals/string.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{templateElement, templateLiteral, taggedTemplateExpression} = import '@babel/types'
babel_types = import '@babel/types'
{templateElement, templateLiteral, taggedTemplateExpression} = babel_types
{rx, replace_all} = import '@fink/std-lib/regex.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/logical/in.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{identifier, optionalCallExpression, optionalMemberExpression, memberExpression, callExpression, logicalExpression} = import '@babel/types'
babel_types = import '@babel/types'
{identifier, optionalCallExpression, optionalMemberExpression, memberExpression, callExpression, logicalExpression} = babel_types


transform_in = fn node, ctx:
Expand Down
3 changes: 2 additions & 1 deletion src/lang/logical/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{logicalExpression, unaryExpression} = import '@babel/types'
babel_types = import '@babel/types'
{logicalExpression, unaryExpression} = babel_types
{add, any} = import '../context.fnk'
{transform_in} = import './in.fnk'

Expand Down
3 changes: 2 additions & 1 deletion src/lang/module/import.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{callExpression, Import: async_import} = import '@babel/types'
babel_types = import '@babel/types'
{callExpression, Import: async_import} = babel_types
{ends_with, starts_with, slice, is_str} = import '@fink/std-lib/str.fnk'


Expand Down
3 changes: 2 additions & 1 deletion src/lang/module/init.fnk
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
babel_types = import '@babel/types'
{
file, program, interpreterDirective, stringLiteral
importDeclaration, importSpecifier, importDefaultSpecifier
exportNamedDeclaration, exportDefaultDeclaration, identifier
} = import '@babel/types'
} = babel_types
{starts_with, slice} = import '@fink/std-lib/str.fnk'

{add, any} = import '../context.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/partial/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{identifier} = import '@babel/types'
babel_types = import '@babel/types'
{identifier} = babel_types

{escape_ident} = import '../../js/identifier.fnk'
{add} = import '../context.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/prop-access/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{memberExpression, identifier} = import '@babel/types'
babel_types = import '@babel/types'
{memberExpression, identifier} = babel_types
{rx, matches} = import '@fink/std-lib/regex.fnk'

{raw_str} = import '../../js/types.fnk'
Expand Down
3 changes: 2 additions & 1 deletion src/lang/spread/init.fnk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{spreadElement} = import '@babel/types'
babel_types = import '@babel/types'
{spreadElement} = babel_types
{add, any} = import '../context.fnk'


Expand Down

0 comments on commit aa3183a

Please sign in to comment.