@valbuild/cli 0.33.0 → 0.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/cli/dist/valbuild-cli-cli.cjs.dev.js +4 -60
  2. package/cli/dist/valbuild-cli-cli.cjs.prod.js +4 -60
  3. package/cli/dist/valbuild-cli-cli.esm.js +3 -57
  4. package/package.json +3 -3
  5. package/src/cli.ts +1 -72
  6. package/tsconfig.json +1 -0
package/cli/dist/valbuild-cli-cli.cjs.dev.js CHANGED
@@ -1,30 +1,22 @@
1
1
  'use strict';
2
2
 
3
- var path = require('path');
4
3
  var meow = require('meow');
5
- var server = require('@valbuild/server');
6
4
  var chalk = require('chalk');
7
- var express = require('express');
8
- var cors = require('cors');
9
- var node_http = require('node:http');
5
+ var path = require('path');
6
+ var server = require('@valbuild/server');
10
7
  var fastGlob = require('fast-glob');
11
8
  var picocolors = require('picocolors');
12
9
 
13
10
  function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
14
11
 
15
- var path__default = /*#__PURE__*/_interopDefault(path);
16
12
  var meow__default = /*#__PURE__*/_interopDefault(meow);
17
13
  var chalk__default = /*#__PURE__*/_interopDefault(chalk);
18
- var express__default = /*#__PURE__*/_interopDefault(express);
19
- var cors__default = /*#__PURE__*/_interopDefault(cors);
14
+ var path__default = /*#__PURE__*/_interopDefault(path);
20
15
  var picocolors__default = /*#__PURE__*/_interopDefault(picocolors);
21
16
 
22
17
  function error(...message) {
23
18
  console.error(chalk__default["default"].red(...message));
24
19
  }
25
- function info(...message) {
26
- console.log(...message);
27
- }
28
20
 
29
21
  async function validate({
30
22
  root,
@@ -60,7 +52,7 @@ async function validate({
60
52
  await service.patch(moduleId, fixPatch.patch);
61
53
  console.log(picocolors__default["default"].green("✔"), "Applied fix for", sourcePath);
62
54
  }
63
- fixPatch === null || fixPatch === void 0 ? void 0 : (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 ? void 0 : _fixPatch$remainingEr.forEach(e => {
55
+ fixPatch === null || fixPatch === void 0 || (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 || _fixPatch$remainingEr.forEach(e => {
64
56
  errors += 1;
65
57
  console.log(v.fixes ? picocolors__default["default"].yellow("⚠") : picocolors__default["default"].red("✘"), `Found ${v.fixes ? "fixable " : ""}error in`, `${sourcePath}:`, e.message);
66
58
  });
@@ -88,48 +80,6 @@ async function validate({
88
80
  return;
89
81
  }
90
82
 
91
- async function serve({
92
- root,
93
- port,
94
- cfg
95
- }) {
96
- const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
97
- const service = await server.createService(projectRoot, {
98
- valConfigPath: cfg ?? "./val.config"
99
- });
100
- const valReqHandler = server.createRequestHandler(new server.LocalValServer({
101
- service,
102
- git: await server.safeReadGit(projectRoot)
103
- }));
104
- const app = express__default["default"]();
105
- // TODO: Properly configure CORS
106
- app.use(cors__default["default"](), valReqHandler);
107
- const server$1 = node_http.createServer(app);
108
- await new Promise(resolve => {
109
- server$1.listen(port, resolve);
110
- });
111
- info(`Root is ${projectRoot}`);
112
- info(`Config is ${service.valConfigPath}`);
113
- info(`Listening on port ${port}`);
114
- let handled = false;
115
- const handleInterrupt = async () => {
116
- if (handled) return;
117
- handled = true;
118
- info("Shutting down...");
119
- server$1.close(err => {
120
- if (!err) return;
121
- error(err.toString());
122
- });
123
- };
124
- process.on("SIGINT", handleInterrupt);
125
- process.on("SIGTERM", handleInterrupt);
126
- return new Promise(resolve => {
127
- server$1.on("close", () => {
128
- service.dispose();
129
- resolve();
130
- });
131
- });
132
- }
133
83
  async function main() {
134
84
  const {
135
85
  input,
@@ -177,12 +127,6 @@ async function main() {
177
127
  }
178
128
  const [command] = input;
179
129
  switch (command) {
180
- case "serve":
181
- return serve({
182
- root: flags.root,
183
- port: flags.port,
184
- cfg: flags.cfg
185
- });
186
130
  case "validate":
187
131
  case "idate":
188
132
  return validate({
package/cli/dist/valbuild-cli-cli.cjs.prod.js CHANGED
@@ -1,30 +1,22 @@
1
1
  'use strict';
2
2
 
3
- var path = require('path');
4
3
  var meow = require('meow');
5
- var server = require('@valbuild/server');
6
4
  var chalk = require('chalk');
7
- var express = require('express');
8
- var cors = require('cors');
9
- var node_http = require('node:http');
5
+ var path = require('path');
6
+ var server = require('@valbuild/server');
10
7
  var fastGlob = require('fast-glob');
11
8
  var picocolors = require('picocolors');
12
9
 
13
10
  function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
14
11
 
15
- var path__default = /*#__PURE__*/_interopDefault(path);
16
12
  var meow__default = /*#__PURE__*/_interopDefault(meow);
17
13
  var chalk__default = /*#__PURE__*/_interopDefault(chalk);
18
- var express__default = /*#__PURE__*/_interopDefault(express);
19
- var cors__default = /*#__PURE__*/_interopDefault(cors);
14
+ var path__default = /*#__PURE__*/_interopDefault(path);
20
15
  var picocolors__default = /*#__PURE__*/_interopDefault(picocolors);
21
16
 
22
17
  function error(...message) {
23
18
  console.error(chalk__default["default"].red(...message));
24
19
  }
25
- function info(...message) {
26
- console.log(...message);
27
- }
28
20
 
29
21
  async function validate({
30
22
  root,
@@ -60,7 +52,7 @@ async function validate({
60
52
  await service.patch(moduleId, fixPatch.patch);
61
53
  console.log(picocolors__default["default"].green("✔"), "Applied fix for", sourcePath);
62
54
  }
63
- fixPatch === null || fixPatch === void 0 ? void 0 : (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 ? void 0 : _fixPatch$remainingEr.forEach(e => {
55
+ fixPatch === null || fixPatch === void 0 || (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 || _fixPatch$remainingEr.forEach(e => {
64
56
  errors += 1;
65
57
  console.log(v.fixes ? picocolors__default["default"].yellow("⚠") : picocolors__default["default"].red("✘"), `Found ${v.fixes ? "fixable " : ""}error in`, `${sourcePath}:`, e.message);
66
58
  });
@@ -88,48 +80,6 @@ async function validate({
88
80
  return;
89
81
  }
90
82
 
91
- async function serve({
92
- root,
93
- port,
94
- cfg
95
- }) {
96
- const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
97
- const service = await server.createService(projectRoot, {
98
- valConfigPath: cfg ?? "./val.config"
99
- });
100
- const valReqHandler = server.createRequestHandler(new server.LocalValServer({
101
- service,
102
- git: await server.safeReadGit(projectRoot)
103
- }));
104
- const app = express__default["default"]();
105
- // TODO: Properly configure CORS
106
- app.use(cors__default["default"](), valReqHandler);
107
- const server$1 = node_http.createServer(app);
108
- await new Promise(resolve => {
109
- server$1.listen(port, resolve);
110
- });
111
- info(`Root is ${projectRoot}`);
112
- info(`Config is ${service.valConfigPath}`);
113
- info(`Listening on port ${port}`);
114
- let handled = false;
115
- const handleInterrupt = async () => {
116
- if (handled) return;
117
- handled = true;
118
- info("Shutting down...");
119
- server$1.close(err => {
120
- if (!err) return;
121
- error(err.toString());
122
- });
123
- };
124
- process.on("SIGINT", handleInterrupt);
125
- process.on("SIGTERM", handleInterrupt);
126
- return new Promise(resolve => {
127
- server$1.on("close", () => {
128
- service.dispose();
129
- resolve();
130
- });
131
- });
132
- }
133
83
  async function main() {
134
84
  const {
135
85
  input,
@@ -177,12 +127,6 @@ async function main() {
177
127
  }
178
128
  const [command] = input;
179
129
  switch (command) {
180
- case "serve":
181
- return serve({
182
- root: flags.root,
183
- port: flags.port,
184
- cfg: flags.cfg
185
- });
186
130
  case "validate":
187
131
  case "idate":
188
132
  return validate({
package/cli/dist/valbuild-cli-cli.esm.js CHANGED
@@ -1,19 +1,13 @@
1
- import path from 'path';
2
1
  import meow from 'meow';
3
- import { createService, createFixPatch, createRequestHandler, LocalValServer, safeReadGit } from '@valbuild/server';
4
2
  import chalk from 'chalk';
5
- import express from 'express';
6
- import cors from 'cors';
7
- import { createServer } from 'node:http';
3
+ import path from 'path';
4
+ import { createService, createFixPatch } from '@valbuild/server';
8
5
  import { glob } from 'fast-glob';
9
6
  import picocolors from 'picocolors';
10
7
 
11
8
  function error(...message) {
12
9
  console.error(chalk.red(...message));
13
10
  }
14
- function info(...message) {
15
- console.log(...message);
16
- }
17
11
 
18
12
  async function validate({
19
13
  root,
@@ -49,7 +43,7 @@ async function validate({
49
43
  await service.patch(moduleId, fixPatch.patch);
50
44
  console.log(picocolors.green("✔"), "Applied fix for", sourcePath);
51
45
  }
52
- fixPatch === null || fixPatch === void 0 ? void 0 : (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 ? void 0 : _fixPatch$remainingEr.forEach(e => {
46
+ fixPatch === null || fixPatch === void 0 || (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 || _fixPatch$remainingEr.forEach(e => {
53
47
  errors += 1;
54
48
  console.log(v.fixes ? picocolors.yellow("⚠") : picocolors.red("✘"), `Found ${v.fixes ? "fixable " : ""}error in`, `${sourcePath}:`, e.message);
55
49
  });
@@ -77,48 +71,6 @@ async function validate({
77
71
  return;
78
72
  }
79
73
 
80
- async function serve({
81
- root,
82
- port,
83
- cfg
84
- }) {
85
- const projectRoot = root ? path.resolve(root) : process.cwd();
86
- const service = await createService(projectRoot, {
87
- valConfigPath: cfg ?? "./val.config"
88
- });
89
- const valReqHandler = createRequestHandler(new LocalValServer({
90
- service,
91
- git: await safeReadGit(projectRoot)
92
- }));
93
- const app = express();
94
- // TODO: Properly configure CORS
95
- app.use(cors(), valReqHandler);
96
- const server = createServer(app);
97
- await new Promise(resolve => {
98
- server.listen(port, resolve);
99
- });
100
- info(`Root is ${projectRoot}`);
101
- info(`Config is ${service.valConfigPath}`);
102
- info(`Listening on port ${port}`);
103
- let handled = false;
104
- const handleInterrupt = async () => {
105
- if (handled) return;
106
- handled = true;
107
- info("Shutting down...");
108
- server.close(err => {
109
- if (!err) return;
110
- error(err.toString());
111
- });
112
- };
113
- process.on("SIGINT", handleInterrupt);
114
- process.on("SIGTERM", handleInterrupt);
115
- return new Promise(resolve => {
116
- server.on("close", () => {
117
- service.dispose();
118
- resolve();
119
- });
120
- });
121
- }
122
74
  async function main() {
123
75
  const {
124
76
  input,
@@ -166,12 +118,6 @@ async function main() {
166
118
  }
167
119
  const [command] = input;
168
120
  switch (command) {
169
- case "serve":
170
- return serve({
171
- root: flags.root,
172
- port: flags.port,
173
- cfg: flags.cfg
174
- });
175
121
  case "validate":
176
122
  case "idate":
177
123
  return validate({
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@valbuild/cli",
3
3
  "private": false,
4
- "version": "0.33.0",
4
+ "version": "0.35.0",
5
5
  "description": "Val CLI tools",
6
6
  "bin": {
7
7
  "val": "./bin.js"
@@ -17,7 +17,7 @@
17
17
  "typecheck": "tsc --noEmit"
18
18
  },
19
19
  "dependencies": {
20
- "@valbuild/server": "~0.33.0",
20
+ "@valbuild/server": "~0.35.0",
21
21
  "chalk": "^4.1.2",
22
22
  "cors": "^2.8.5",
23
23
  "express": "^4.18.2",
@@ -31,6 +31,6 @@
31
31
  ]
32
32
  },
33
33
  "engines": {
34
- "node": ">=16.0.0"
34
+ "node": ">=18.17.14"
35
35
  }
36
36
  }
package/src/cli.ts CHANGED
@@ -1,72 +1,7 @@
1
- import path from "path";
2
1
  import meow from "meow";
3
- import {
4
- createRequestHandler,
5
- createService,
6
- safeReadGit,
7
- } from "@valbuild/server";
8
- import { error, info } from "./logger";
9
- import express from "express";
10
- import cors from "cors";
11
- import { createServer, Server } from "node:http";
12
- import { LocalValServer } from "@valbuild/server";
2
+ import { error } from "./logger";
13
3
  import { validate } from "./validate";
14
4
 
15
- async function serve({
16
- root,
17
- port,
18
- cfg,
19
- }: {
20
- root?: string;
21
- port: number;
22
- cfg?: string;
23
- }): Promise<void> {
24
- const projectRoot = root ? path.resolve(root) : process.cwd();
25
- const service = await createService(projectRoot, {
26
- valConfigPath: cfg ?? "./val.config",
27
- });
28
- const valReqHandler = createRequestHandler(
29
- new LocalValServer({
30
- service,
31
- git: await safeReadGit(projectRoot),
32
- })
33
- );
34
- const app = express();
35
- // TODO: Properly configure CORS
36
- app.use(cors(), valReqHandler);
37
- const server: Server = createServer(app);
38
- await new Promise<void>((resolve) => {
39
- server.listen(port, resolve);
40
- });
41
-
42
- info(`Root is ${projectRoot}`);
43
- info(`Config is ${service.valConfigPath}`);
44
- info(`Listening on port ${port}`);
45
-
46
- let handled = false;
47
- const handleInterrupt: NodeJS.SignalsListener = async () => {
48
- if (handled) return;
49
- handled = true;
50
-
51
- info("Shutting down...");
52
-
53
- server.close((err) => {
54
- if (!err) return;
55
- error(err.toString());
56
- });
57
- };
58
-
59
- process.on("SIGINT", handleInterrupt);
60
- process.on("SIGTERM", handleInterrupt);
61
-
62
- return new Promise((resolve) => {
63
- server.on("close", () => {
64
- service.dispose();
65
- resolve();
66
- });
67
- });
68
- }
69
-
70
5
  async function main(): Promise<void> {
71
6
  const { input, flags, showHelp } = meow(
72
7
  `
@@ -116,12 +51,6 @@ async function main(): Promise<void> {
116
51
 
117
52
  const [command] = input;
118
53
  switch (command) {
119
- case "serve":
120
- return serve({
121
- root: flags.root,
122
- port: flags.port,
123
- cfg: flags.cfg,
124
- });
125
54
  case "validate":
126
55
  case "idate":
127
56
  return validate({
package/tsconfig.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "compilerOptions": {
3
+ "lib": ["es2020", "DOM"],
3
4
  "strict": true,
4
5
  "isolatedModules": true,
5
6
  "noEmit": true,