vize 0.727.0 → 0.729.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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vize",
3
- "version": "0.727.0",
3
+ "version": "0.729.0",
4
4
  "description": "Vize - High-performance Vue.js toolchain in Rust",
5
5
  "keywords": [
6
6
  "cli",
@@ -92,7 +92,7 @@
92
92
  "access": "public"
93
93
  },
94
94
  "dependencies": {
95
- "@vizejs/native": "0.727.0",
95
+ "@vizejs/native": "0.729.0",
96
96
  "oxc-transform": "0.157.0"
97
97
  },
98
98
  "devDependencies": {
package/src/cli.ts CHANGED
@@ -3,6 +3,10 @@ import { createRequire } from "node:module";
3
3
  import path from "node:path";
4
4
  import { fileURLToPath } from "node:url";
5
5
 
6
+ import {
7
+ answerContentMapperInitialize,
8
+ ContentMapperFramingError,
9
+ } from "./content-mapper-launch.js";
6
10
  import { runInitCli } from "./init.js";
7
11
  import { nativeVersionMismatchMessage } from "./native-version.js";
8
12
  import { runSetupCli } from "./setup.js";
@@ -47,11 +51,24 @@ try {
47
51
  // `init` prompts, so it is the one command that has to be async. Failures
48
52
  // land in the same reporter as the synchronous commands.
49
53
  runInitCli(args.slice(1)).catch(fail);
54
+ } else if (args[0] === "content-mapper") {
55
+ assertMatchingNativeVersion();
56
+ // Reply before the addon loads; the host's `initialize` wait is fixed (#12530).
57
+ if (answerContentMapperInitialize()) {
58
+ const native = require("@vizejs/native") as typeof import("@vizejs/native");
59
+ native.runCli([...args, "--initialized"]);
60
+ }
50
61
  } else {
51
62
  assertMatchingNativeVersion();
52
63
  const native = require("@vizejs/native") as typeof import("@vizejs/native");
53
64
  native.runCli(args);
54
65
  }
55
66
  } catch (error) {
56
- fail(error);
67
+ if (error instanceof ContentMapperFramingError) {
68
+ // The native server reports a broken stream the same way.
69
+ process.stderr.write(`vize content-mapper: ${error.message}\n`);
70
+ process.exitCode = 1;
71
+ } else {
72
+ fail(error);
73
+ }
57
74
  }
@@ -0,0 +1,145 @@
1
+ // The TypeScript host waits a fixed 5 s for the content mapper's `initialize`
2
+ // reply, and the first `require()` of a freshly installed native addon can
3
+ // take most of that (#12530). The reply only declares capabilities, so the
4
+ // launcher answers it here and loads the addon afterwards. The native server
5
+ // then reads the rest of the same stream, already initialized.
6
+ //
7
+ // Frames are read from fd 0 with exact lengths and no read-ahead, so every
8
+ // later byte is left for the native reader. Until `initialize` succeeds this
9
+ // replies as the native server does to an uninitialized stream.
10
+ import { readSync, writeSync } from "node:fs";
11
+
12
+ const MAX_HEADER_BYTES = 8 * 1024;
13
+ const MAX_MESSAGE_BYTES = 64 * 1024 * 1024;
14
+ const idle = new Int32Array(new SharedArrayBuffer(4));
15
+
16
+ export class ContentMapperFramingError extends Error {}
17
+
18
+ function readSome(buffer: Buffer, offset: number, length: number): number {
19
+ for (;;) {
20
+ try {
21
+ return readSync(0, buffer, offset, length, null);
22
+ } catch (error) {
23
+ const code = (error as NodeJS.ErrnoException).code;
24
+ if (code === "EOF") return 0;
25
+ if (code !== "EAGAIN") throw error;
26
+ Atomics.wait(idle, 0, 0, 5);
27
+ }
28
+ }
29
+ }
30
+
31
+ /** One frame body, or `null` at EOF before any header byte. */
32
+ function readFrame() {
33
+ const byte = Buffer.alloc(1);
34
+ let header = "";
35
+ let line = "";
36
+ let contentLength: number | undefined;
37
+ for (;;) {
38
+ if (header.length >= MAX_HEADER_BYTES) {
39
+ throw new ContentMapperFramingError("content-mapper headers exceed 8 KiB");
40
+ }
41
+ if (readSome(byte, 0, 1) === 0) {
42
+ if (header.length === 0) return null;
43
+ throw new ContentMapperFramingError("EOF inside content-mapper headers");
44
+ }
45
+ const char = byte.toString("latin1");
46
+ header += char;
47
+ line += char;
48
+ if (char !== "\n") continue;
49
+ if (line === "\r\n" || line === "\n") break;
50
+ const separator = line.indexOf(":");
51
+ if (separator >= 0 && line.slice(0, separator).toLowerCase() === "content-length") {
52
+ if (contentLength !== undefined) {
53
+ throw new ContentMapperFramingError("duplicate Content-Length header");
54
+ }
55
+ const value = line.slice(separator + 1).trim();
56
+ if (!/^\d+$/.test(value)) throw new ContentMapperFramingError("invalid Content-Length");
57
+ contentLength = Number(value);
58
+ }
59
+ line = "";
60
+ }
61
+ if (contentLength === undefined) {
62
+ throw new ContentMapperFramingError("missing Content-Length header");
63
+ }
64
+ if (contentLength > MAX_MESSAGE_BYTES) {
65
+ throw new ContentMapperFramingError("content-mapper message exceeds 64 MiB");
66
+ }
67
+ const body = Buffer.alloc(contentLength);
68
+ for (let offset = 0; offset < contentLength;) {
69
+ const read = readSome(body, offset, contentLength - offset);
70
+ if (read === 0) throw new ContentMapperFramingError("EOF inside a content-mapper message");
71
+ offset += read;
72
+ }
73
+ return body;
74
+ }
75
+
76
+ function writeFrame(value: unknown): void {
77
+ const body = Buffer.from(JSON.stringify(value));
78
+ const frame = Buffer.concat([Buffer.from(`Content-Length: ${body.length}\r\n\r\n`), body]);
79
+ for (let offset = 0; offset < frame.length;) {
80
+ offset += writeSync(1, frame, offset);
81
+ }
82
+ }
83
+
84
+ // Key order follows the native server's sorted JSON objects.
85
+ const fail = (id: unknown, code: number, message: string) =>
86
+ writeFrame({ error: { code, message }, id, jsonrpc: "2.0" });
87
+
88
+ function initializeProblem(params: unknown): string | null {
89
+ if (typeof params !== "object" || params === null || Array.isArray(params)) {
90
+ return "Invalid initialize params: expected an object";
91
+ }
92
+ const { locale, positionEncodings } = params as Record<string, unknown>;
93
+ if (locale !== undefined && locale !== null && typeof locale !== "string") {
94
+ return "Invalid initialize params: `locale` must be a string";
95
+ }
96
+ if (positionEncodings === undefined) {
97
+ return "Invalid initialize params: missing field `positionEncodings`";
98
+ }
99
+ if (!Array.isArray(positionEncodings) || positionEncodings.some((e) => typeof e !== "string")) {
100
+ return "Invalid initialize params: `positionEncodings` must be a string array";
101
+ }
102
+ if (!positionEncodings.includes("utf-8")) return "Vize requires the utf-8 position encoding";
103
+ return null;
104
+ }
105
+
106
+ /**
107
+ * Answer the stream until `initialize` succeeds. `true` means the native
108
+ * server takes over initialized; `false` means the host closed the stream
109
+ * first and there is nothing to serve.
110
+ */
111
+ export function answerContentMapperInitialize(): boolean {
112
+ for (;;) {
113
+ const body = readFrame();
114
+ if (body === null) return false;
115
+ let request: Record<string, unknown>;
116
+ try {
117
+ const parsed: unknown = JSON.parse(body.toString("utf8"));
118
+ if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
119
+ throw new Error("expected a request object");
120
+ }
121
+ request = parsed as Record<string, unknown>;
122
+ if (typeof request.method !== "string") throw new Error("missing field `method`");
123
+ } catch (error) {
124
+ fail(null, -32700, `Parse error: ${(error as Error).message}`);
125
+ continue;
126
+ }
127
+ const id = request.id ?? null;
128
+ if (request.method === "initialize") {
129
+ const problem = initializeProblem(request.params ?? null);
130
+ if (problem === null) {
131
+ writeFrame({
132
+ id,
133
+ jsonrpc: "2.0",
134
+ result: { diagnosticSource: "vize", positionEncoding: "utf-8" },
135
+ });
136
+ return true;
137
+ }
138
+ fail(id, -32602, problem);
139
+ } else if (["openProject", "closeProject", "transform"].includes(request.method as string)) {
140
+ fail(id, -32002, "Content mapper is not initialized");
141
+ } else {
142
+ fail(id, -32601, `Method not found: ${request.method as string}`);
143
+ }
144
+ }
145
+ }
@@ -18,3 +18,130 @@ export type $ListenerArgs<
18
18
  ? __A
19
19
  : $ListenerMissing<__P, __Raw>
20
20
  : $ListenerMissing<__P, __Raw>;
21
+ type $ListenerPropArgs<
22
+ __L,
23
+ __PB,
24
+ __K extends string | number | symbol,
25
+ __Raw extends string | number | symbol,
26
+ > = [__L] extends [true]
27
+ ? unknown[]
28
+ : __PB extends [infer __P]
29
+ ? $ListenerArgs<__P, __K, __Raw>
30
+ : unknown[];
31
+ type $ListenerFallthroughArgs<
32
+ __FB,
33
+ __K extends string | number | symbol,
34
+ __Raw extends string | number | symbol,
35
+ > = __FB extends [infer __F]
36
+ ? NonNullable<__F> extends infer __P
37
+ ? $ListenerArgs<__P, __K, __Raw> extends infer __A extends unknown[]
38
+ ? __A extends []
39
+ ? unknown[]
40
+ : __A
41
+ : unknown[]
42
+ : unknown[]
43
+ : unknown[];
44
+ type $ListenerStaticArgs<__EB, __K extends string | number | symbol> = __EB extends [infer __EP]
45
+ ? __EP extends { [__Q in __K]?: (...args: infer __A) => any }
46
+ ? __A
47
+ : unknown[]
48
+ : unknown[];
49
+ type $ListenerPayload<__Prop, __Static, __Unresolved, __Inferred, __Loose> = [__Loose] extends [
50
+ true,
51
+ ]
52
+ ? unknown[]
53
+ : unknown[] extends __Inferred
54
+ ? unknown[] extends __Prop
55
+ ? unknown[] extends __Static
56
+ ? __Unresolved
57
+ : __Static
58
+ : __Prop
59
+ : __Inferred;
60
+ type $ListenerEvent<__Args> = [__Args] extends [infer __A extends unknown[]]
61
+ ? [__A] extends [[]]
62
+ ? any
63
+ : unknown[] extends __A
64
+ ? any
65
+ : __A[0]
66
+ : never;
67
+ type $ListenerFallthroughReturn<__FB, __K extends string | number | symbol> = __FB extends [
68
+ infer __F,
69
+ ]
70
+ ? NonNullable<__F> extends { [__Q in __K]?: infer __H }
71
+ ? Extract<NonNullable<__H>, (...args: any[]) => any> extends (...args: any[]) => infer __R
72
+ ? __R
73
+ : any
74
+ : any
75
+ : any;
76
+ type $ListenerReturn<
77
+ __Prop,
78
+ __PB,
79
+ __Unresolved,
80
+ __K extends string | number | symbol,
81
+ > = unknown[] extends __Prop
82
+ ? __Unresolved
83
+ : __PB extends [infer __P]
84
+ ? __P extends { [__Q in __K]?: (...args: any[]) => infer __R }
85
+ ? __R
86
+ : any
87
+ : any;
88
+ type $ListenerArrays<__PB, __K extends string | number | symbol> = __PB extends [infer __P]
89
+ ? 0 extends 1 & __P
90
+ ? never
91
+ : __P extends { [__Q in __K]?: infer __H }
92
+ ? Extract<NonNullable<__H>, readonly unknown[]>
93
+ : never
94
+ : never;
95
+ type $ListenerShape<
96
+ __Args,
97
+ __Return,
98
+ __Arrays,
99
+ __Listener = unknown[] extends __Args
100
+ ? (...args: any[]) => any
101
+ : (...args: __Args extends unknown[] ? __Args : never) => __Return,
102
+ > = {
103
+ event: $ListenerEvent<__Args>;
104
+ listener: __Listener;
105
+ handler: unknown[] extends __Args ? (...args: any[]) => any : __Listener;
106
+ looseHandler: unknown[] extends __Args ? unknown : __Listener;
107
+ arrays: __Arrays;
108
+ };
109
+ type $ListenerContractOf<
110
+ __PB,
111
+ __FB,
112
+ __K extends string | number | symbol,
113
+ __Raw extends string | number | symbol,
114
+ __Prop,
115
+ __Static,
116
+ __Inferred,
117
+ __Loose,
118
+ > = $ListenerShape<
119
+ $ListenerPayload<
120
+ __Prop,
121
+ __Static,
122
+ $ListenerFallthroughArgs<__FB, __K, __Raw>,
123
+ __Inferred,
124
+ __Loose
125
+ >,
126
+ $ListenerReturn<__Prop, __PB, $ListenerFallthroughReturn<__FB, __K>, __K>,
127
+ $ListenerArrays<__PB, __K>
128
+ >;
129
+ export type $ListenerContract<
130
+ __L,
131
+ __PB,
132
+ __EB,
133
+ __FB,
134
+ __K extends string | number | symbol,
135
+ __Raw extends string | number | symbol,
136
+ __Inferred,
137
+ __Loose,
138
+ > = $ListenerContractOf<
139
+ __PB,
140
+ __FB,
141
+ __K,
142
+ __Raw,
143
+ $ListenerPropArgs<__L, __PB, __K, __Raw>,
144
+ $ListenerStaticArgs<__EB, __K>,
145
+ __Inferred,
146
+ __Loose
147
+ >;
package/virtual-ts.d.cts CHANGED
@@ -274,6 +274,13 @@ export type $PropValue<
274
274
  F = unknown,
275
275
  __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
276
276
  > = [__V] extends [never] ? F : __V;
277
+ export type $PropValueOr<
278
+ P,
279
+ K extends PropertyKey,
280
+ C,
281
+ FK extends PropertyKey = K,
282
+ __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
283
+ > = [__V] extends [never] ? $FallthroughValue<C, FK> : __V;
277
284
  type $InvalidFallthroughSpreadKeys<P, F, A> = {
278
285
  [K in keyof A]-?: K extends keyof P | keyof $KebabProps<P>
279
286
  ? never
@@ -424,3 +431,13 @@ export type $ListenerArgs<
424
431
  __K extends string | number | symbol,
425
432
  __Raw extends string | number | symbol = never,
426
433
  > = __vizeListenerTypes.$ListenerArgs<__P, __K, __Raw>;
434
+ export type $ListenerContract<
435
+ __L,
436
+ __PB,
437
+ __EB,
438
+ __FB,
439
+ __K extends string | number | symbol,
440
+ __Raw extends string | number | symbol,
441
+ __Inferred,
442
+ __Loose,
443
+ > = __vizeListenerTypes.$ListenerContract<__L, __PB, __EB, __FB, __K, __Raw, __Inferred, __Loose>;
package/virtual-ts.d.mts CHANGED
@@ -274,6 +274,13 @@ export type $PropValue<
274
274
  F = unknown,
275
275
  __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
276
276
  > = [__V] extends [never] ? F : __V;
277
+ export type $PropValueOr<
278
+ P,
279
+ K extends PropertyKey,
280
+ C,
281
+ FK extends PropertyKey = K,
282
+ __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
283
+ > = [__V] extends [never] ? $FallthroughValue<C, FK> : __V;
277
284
  type $InvalidFallthroughSpreadKeys<P, F, A> = {
278
285
  [K in keyof A]-?: K extends keyof P | keyof $KebabProps<P>
279
286
  ? never
@@ -424,3 +431,13 @@ export type $ListenerArgs<
424
431
  __K extends string | number | symbol,
425
432
  __Raw extends string | number | symbol = never,
426
433
  > = __vizeListenerTypes.$ListenerArgs<__P, __K, __Raw>;
434
+ export type $ListenerContract<
435
+ __L,
436
+ __PB,
437
+ __EB,
438
+ __FB,
439
+ __K extends string | number | symbol,
440
+ __Raw extends string | number | symbol,
441
+ __Inferred,
442
+ __Loose,
443
+ > = __vizeListenerTypes.$ListenerContract<__L, __PB, __EB, __FB, __K, __Raw, __Inferred, __Loose>;
package/virtual-ts.d.ts CHANGED
@@ -274,6 +274,13 @@ export type $PropValue<
274
274
  F = unknown,
275
275
  __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
276
276
  > = [__V] extends [never] ? F : __V;
277
+ export type $PropValueOr<
278
+ P,
279
+ K extends PropertyKey,
280
+ C,
281
+ FK extends PropertyKey = K,
282
+ __V = P extends unknown ? (K extends keyof P ? P[K] : never) : never,
283
+ > = [__V] extends [never] ? $FallthroughValue<C, FK> : __V;
277
284
  type $InvalidFallthroughSpreadKeys<P, F, A> = {
278
285
  [K in keyof A]-?: K extends keyof P | keyof $KebabProps<P>
279
286
  ? never
@@ -424,3 +431,13 @@ export type $ListenerArgs<
424
431
  __K extends string | number | symbol,
425
432
  __Raw extends string | number | symbol = never,
426
433
  > = __vizeListenerTypes.$ListenerArgs<__P, __K, __Raw>;
434
+ export type $ListenerContract<
435
+ __L,
436
+ __PB,
437
+ __EB,
438
+ __FB,
439
+ __K extends string | number | symbol,
440
+ __Raw extends string | number | symbol,
441
+ __Inferred,
442
+ __Loose,
443
+ > = __vizeListenerTypes.$ListenerContract<__L, __PB, __EB, __FB, __K, __Raw, __Inferred, __Loose>;