8835448878

Committed 25 Apr 2024 03:36PM UTC coverage: 93.103% (+0.4%) from 92.658%

Build # 8835448878

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1180 from DanielXMoore/comptime

First version of comptime (synchronous, no outer scope)

Run Details

2120 of 2301 branches covered (92.13%)

Branch coverage included in aggregate %.

615 of 641 new or added lines in 14 files covered. (95.94%)

8 existing lines in 1 file now uncovered.

14268 of 15301 relevant lines covered (93.25%)

17684.19 hits per line

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

75.29

/source/config.civet

path from path
fs from fs/promises
{ compile } from ./main.civet

// TODO: Once the types are exported within the Civet source code,
// we should import them directly here, instead of looking at an old release.
type { CompileOptions } from "@danielx/civet"

configFileNames := new Set [
  "🐈.json"
  "🐈.civet"
  "civetconfig.json"
  "civetconfig.civet"
]

function findInDir(dirPath: string): Promise<string | undefined>
  dir := await fs.opendir(dirPath)
  for await entry of dir
    if entry.isDirectory() and entry.name === ".config"
      // scan for ./civet.json as well as ./.config/civet.json
      const found = await findInDir(
        path.join(dirPath, entry.name)
      );
      return found if found

    if entry.isFile()
      const name = entry.name.replace(/^\./, ""); // allow both .civetconfig.civet and civetconfig.civet
      if configFileNames.has name
        return path.join dirPath, entry.name

  return

export function findConfig(startDir: string): Promise<string | undefined>
  curr .= startDir
  parent .= path.dirname curr

  while curr !== parent
    // root directory (/, C:, etc.)
    configPath := await findInDir curr
    return configPath if configPath

    curr = parent
    parent = path.dirname curr

  return

export function loadConfig(path: string): Promise<CompileOptions>
  config := await fs.readFile path, "utf8"

  let data: CompileOptions = {}
  if path.endsWith ".json"
    try
      data = JSON.parse config
    catch e
      throw new Error `Error parsing JSON config file ${path}: ${e}`
  else
    let js
    try
      js = compile config, js: true
    catch e
      throw new Error `Error compiling Civet config file ${path}: ${e}`

    try
      exports := await import `data:text/javascript,${ encodeURIComponent js }`
      data = exports?.default
    catch e
      throw new Error `Error running Civet config file ${path}: ${e}`

  unless data? <? "object" and not Array.isArray data
    throw new Error `Civet config file must export an object, not ${Array.isArray(data) ? 'array' : data? ? typeof data : 'null'}`

  // Forbid enabling comptime in the config file
  delete data?.parseOptions?.comptime
  data

1	path from path	1✔
2	fs from fs/promises	1✔
3	{ compile } from ./main.civet	1✔
4		1✔
5	// TODO: Once the types are exported within the Civet source code,	1✔
6	// we should import them directly here, instead of looking at an old release.	1✔
7	type { CompileOptions } from "@danielx/civet"	1✔
8		1✔
9	configFileNames := new Set [	1✔
10	"🐈.json"	1✔
11	"🐈.civet"	1✔
12	"civetconfig.json"	1✔
13	"civetconfig.civet"	1✔
14	]	1✔
15		1✔
16	function findInDir(dirPath: string): Promise<string \| undefined>	1✔
17	dir := await fs.opendir(dirPath)	1✔
18	for await entry of dir	1✔
19	if entry.isDirectory() and entry.name === ".config"	1!
20	// scan for ./civet.json as well as ./.config/civet.json	×
21	const found = await findInDir(	×
22	path.join(dirPath, entry.name)	×
23	);	×
24	return found if found	×
25		1✔
26	if entry.isFile()	1✔
27	const name = entry.name.replace(/^\./, ""); // allow both .civetconfig.civet and civetconfig.civet	1✔
28	if configFileNames.has name	1✔
29	return path.join dirPath, entry.name	1✔
30		×
31	return	×
32		1✔
33	export function findConfig(startDir: string): Promise<string \| undefined>	1✔
34	curr .= startDir	1✔
35	parent .= path.dirname curr	1✔
36		1✔
37	while curr !== parent	1✔
38	// root directory (/, C:, etc.)	1✔
39	configPath := await findInDir curr	1✔
40	return configPath if configPath	1✔
41		×
42	curr = parent	×
43	parent = path.dirname curr	×
44		×
45	return	×
46		1✔
47	export function loadConfig(path: string): Promise<CompileOptions>	2✔
48	config := await fs.readFile path, "utf8"	2✔
49		2✔
50	let data: CompileOptions = {}	2✔
51	if path.endsWith ".json"	2✔
52	try	1✔
53	data = JSON.parse config	1✔
54	catch e	1✔
55	throw new Error `Error parsing JSON config file ${path}: ${e}`	1✔
56	else	1✔
57	let js	1✔
58	try	1✔
59	js = compile config, js: true	1✔
60	catch e	1!
NEW 61	throw new Error `Error compiling Civet config file ${path}: ${e}`	×
62		1✔
63	try	1✔
64	exports := await import `data:text/javascript,${ encodeURIComponent js }`	1✔
65	data = exports?.default	1✔
66	catch e	1✔
67	throw new Error `Error running Civet config file ${path}: ${e}`	1✔
68		2✔
69	unless data? <? "object" and not Array.isArray data	2✔
NEW 70	throw new Error `Civet config file must export an object, not ${Array.isArray(data) ? 'array' : data? ? typeof data : 'null'}`	×
71		2✔
72	// Forbid enabling comptime in the config file	2✔
73	delete data?.parseOptions?.comptime	2!
74	data	2✔

DanielXMoore / Civet / 8835448878

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