8766190958

Committed 20 Apr 2024 04:01PM UTC coverage: 92.637% (-0.06%) from 92.692%

Build # 8766190958

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1159 from DanielXMoore/new-ampersand

New ampersand proposal (#1070)

BREAKING CHANGE: & can lift the function wrapper to higher than before

Run Details

2094 of 2276 branches covered (92.0%)

Branch coverage included in aggregate %.

440 of 450 new or added lines in 7 files covered. (97.78%)

15 existing lines in 3 files now uncovered.

13984 of 15080 relevant lines covered (92.73%)

29469.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

86.76

/source/generate.civet

// TODO: Sourcemaps
// track output line/column
// - track source line/column
//   - map src string into position / line char lookup
// construct source mapping data

import { removeParentPointers } from './parser/util.civet'

type Options =
  updateSourceMap?: (token: string, pos?: number) => void
  js?: boolean
  errors?: unknown[]

function stringify(node: ???): string
  try
    return JSON.stringify removeParentPointers node
  catch e
    return `${node}`

function gen(node: any, options: Options): string
  if node is null or node is undefined
    return ""

  if node <? "string"
    // increment output line/column
    options?.updateSourceMap? node

    return node

  if Array.isArray(node)
    return node.map (child) ->
      gen child, options
    .join('')

  if node <? "object"
    if options.js and node.ts
      return ""
    if !options.js and node.js
      return ""

    // Check errors after js/ts so that we can have
    // conditional errors based on options
    if node.type is "Error"
      options.errors ?= []
      options.errors.push node
      return ""

    if node.$loc?
      {token, $loc} := node
      options?.updateSourceMap?(token, $loc.pos)
      return token

    if !node.children
      switch node.type
        when "Ref"
          throw new Error(`Unpopulated ref ${stringify node}`)

      debugger
      throw new Error(`Unknown node ${stringify node}`)

    return gen node.children, options

  debugger
  throw new Error(`Unknown node ${stringify node}`)

export default gen

// Remove empty arrays, empty string, null, undefined from node tree
// Useful for debugging so I don't need to step though tons of empty nodes
// Also remove parent pointers so we can JSON.stringify the tree
export function prune(node: any): any
  if node is null or node is undefined
    return

  if node.length is 0
    return
  if node.parent?
    delete node.parent

  if Array.isArray(node)
    a := node.map (n) ->
      prune(n)
    .filter !!&

    if a.length > 1
      return a
    if a.length is 1
      return a[0]
    return

  if node.children?
    node.children = prune(node.children) or []
    return node

  return node

1	// TODO: Sourcemaps	1✔
2	// track output line/column	1✔
3	// - track source line/column	1✔
4	// - map src string into position / line char lookup	1✔
5	// construct source mapping data	1✔
6		1✔
7	import { removeParentPointers } from './parser/util.civet'	1✔
8		1✔
9	type Options =	1✔
10	updateSourceMap?: (token: string, pos?: number) => void	1✔
11	js?: boolean	1✔
12	errors?: unknown[]	1✔
13		1✔
14	function stringify(node: ???): string	×
15	try	×
NEW 16	return JSON.stringify removeParentPointers node	×
17	catch e	×
18	return `${node}`	×
19		1✔
20	function gen(node: any, options: Options): string	134,065✔
21	if node is null or node is undefined	134,065✔
22	return ""	×
23		134,065✔
24	if node <? "string"	134,065✔
25	// increment output line/column	14,521✔
26	options?.updateSourceMap? node	14,521✔
27		14,521✔
28	return node	14,521✔
29		119,544✔
30	if Array.isArray(node)	119,544✔
31	return node.map (child) ->	37,960✔
32	gen child, options	96,643✔
33	.join('')	37,960✔
34		81,584✔
35	if node <? "object"	81,584✔
36	if options.js and node.ts	81,584✔
37	return ""	96✔
38	if !options.js and node.js	81,584✔
39	return ""	47✔
40		81,441✔
41	// Check errors after js/ts so that we can have	81,441✔
42	// conditional errors based on options	81,441✔
43	if node.type is "Error"	81,441✔
44	options.errors ?= []	24✔
45	options.errors.push node	24✔
46	return ""	24✔
47		81,417✔
48	if node.$loc?	81,417✔
49	{token, $loc} := node	46,275✔
50	options?.updateSourceMap?(token, $loc.pos)	46,275✔
51	return token	46,275✔
52		35,142✔
53	if !node.children	35,142✔
54	switch node.type	×
55	when "Ref"	×
56	throw new Error(`Unpopulated ref ${stringify node}`)	×
57		×
58	debugger	×
59	throw new Error(`Unknown node ${stringify node}`)	×
60		35,142✔
61	return gen node.children, options	35,142✔
62		×
63	debugger	×
64	throw new Error(`Unknown node ${stringify node}`)	×
65		1✔
66	export default gen	1✔
67		1✔
68	// Remove empty arrays, empty string, null, undefined from node tree	1✔
69	// Useful for debugging so I don't need to step though tons of empty nodes	1✔
70	// Also remove parent pointers so we can JSON.stringify the tree	1✔
71	export function prune(node: any): any	1✔
72	if node is null or node is undefined	216,980✔
73	return	25,122✔
74		191,858✔
75	if node.length is 0	191,858✔
76	return	19,076✔
77	if node.parent?	172,782✔
78	delete node.parent	75,592✔
79		172,782✔
80	if Array.isArray(node)	172,782✔
81	a := node.map (n) ->	75,049✔
82	prune(n)	178,942✔
83	.filter !!&	75,049✔
84		75,049✔
85	if a.length > 1	75,049✔
86	return a	35,607✔
87	if a.length is 1	39,442✔
88	return a[0]	37,363✔
89	return	2,079✔
90		97,733✔
91	if node.children?	97,733✔
92	node.children = prune(node.children) or []	35,758✔
93	return node	35,758✔
94		61,975✔
95	return node	61,975✔

DanielXMoore / Civet / 8766190958

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous