@rsvelte/vite-plugin-svelte-native 0.3.9 → 0.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsvelte/vite-plugin-svelte-native",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "NAPI bindings to the rsvelte compiler — used by the @rsvelte vite-plugin-svelte shim",
   "license": "MIT",
   "repository": {
@@ -30,11 +30,11 @@
     "index.d.ts"
   ],
   "optionalDependencies": {
-    "@rsvelte/vite-plugin-svelte-native-darwin-arm64": "^0.3.9",
-    "@rsvelte/vite-plugin-svelte-native-darwin-x64": "^0.3.9",
-    "@rsvelte/vite-plugin-svelte-native-linux-arm64-gnu": "^0.3.9",
-    "@rsvelte/vite-plugin-svelte-native-linux-x64-gnu": "^0.3.9",
-    "@rsvelte/vite-plugin-svelte-native-win32-x64-msvc": "^0.3.9"
+    "@rsvelte/vite-plugin-svelte-native-darwin-arm64": "^0.3.11",
+    "@rsvelte/vite-plugin-svelte-native-darwin-x64": "^0.3.11",
+    "@rsvelte/vite-plugin-svelte-native-linux-arm64-gnu": "^0.3.11",
+    "@rsvelte/vite-plugin-svelte-native-linux-x64-gnu": "^0.3.11",
+    "@rsvelte/vite-plugin-svelte-native-win32-x64-msvc": "^0.3.11"
   },
   "publishConfig": {
     "access": "public"

package/parse-envelope.js

@@ -19,7 +19,7 @@ const MAGIC = 0x3156_5052; // "RPV1" little-endian
 // reorder, `typeParameters` on function-like nodes, Identifier `optional`);
 // v4 adds the object-method `typeParameters`-after-`body` flag byte.
 // Keep in lockstep with `napi_raw_parse.rs`'s `VERSION`.
-const VERSION = 5;
+const VERSION = 10;
 const HEADER_LEN = 24;
 
 // Tags — must mirror napi_raw_parse.rs.
@@ -80,7 +80,7 @@ const TAG_AWAIT_BLOCK = 0x72;
 const TAG_KEY_BLOCK = 0x73;
 const TAG_SNIPPET_BLOCK = 0x74;
 
-// JsNode (estree) tags — 0x80..0xCC. Mirrors `napi_raw_parse.rs`.
+// JsNode (estree) tags — 0x80..0xD1. Mirrors `napi_raw_parse.rs`.
 const JS_IDENTIFIER = 0x80;
 const JS_PRIVATE_IDENTIFIER = 0x81;
 const JS_LITERAL = 0x82;
@@ -140,6 +140,8 @@ const JS_CONTINUE_STATEMENT = 0xb7;
 const JS_EMPTY_STATEMENT = 0xb8;
 const JS_DEBUGGER_STATEMENT = 0xb9;
 const JS_IMPORT_DECLARATION = 0xba;
+const JS_IMPORT_ATTRIBUTE = 0xd2;
+const JS_EXPORT_ALL_DECLARATION = 0xd3;
 const JS_IMPORT_SPECIFIER = 0xbb;
 const JS_IMPORT_DEFAULT_SPECIFIER = 0xbc;
 const JS_IMPORT_NAMESPACE_SPECIFIER = 0xbd;
@@ -152,8 +154,8 @@ const JS_PROPERTY_DEFINITION = 0xc3;
 const JS_STATIC_BLOCK = 0xc4;
 const JS_DECORATOR = 0xc5;
 const JS_TS_TYPE_ANNOTATION = 0xc6;
-const JS_TS_ENUM_DECLARATION = 0xc7;
 const JS_TS_MODULE_DECLARATION = 0xc8;
+const JS_TS_MODULE_BLOCK = 0xd4;
 const JS_COMMENT = 0xc9;
 const JS_NULL = 0xca;
 // 0xcb was the former whole-node JS_RAW_JSON escape (removed — TS type
@@ -561,6 +563,8 @@ function readNodeBody(ctx, tag, start, end) {
 			return readJsBareExpr(ctx, 'DebuggerStatement', start, end);
 		case JS_IMPORT_DECLARATION:
 			return readJsImportDeclaration(ctx, start, end);
+		case JS_IMPORT_ATTRIBUTE:
+			return readJsImportAttribute(ctx, start, end);
 		case JS_IMPORT_SPECIFIER:
 			return readJsImportSpecifier(ctx, start, end);
 		case JS_IMPORT_DEFAULT_SPECIFIER:
@@ -571,6 +575,8 @@ function readNodeBody(ctx, tag, start, end) {
 			return readJsExportNamedDeclaration(ctx, start, end);
 		case JS_EXPORT_DEFAULT_DECLARATION:
 			return readJsExportDefaultDeclaration(ctx, start, end);
+		case JS_EXPORT_ALL_DECLARATION:
+			return readJsExportAllDeclaration(ctx, start, end);
 		case JS_EXPORT_SPECIFIER:
 			return readJsExportSpecifier(ctx, start, end);
 		case JS_CLASS_BODY:
@@ -585,12 +591,12 @@ function readNodeBody(ctx, tag, start, end) {
 			return readJsBareExpr(ctx, 'Decorator', start, end);
 		case JS_TS_TYPE_ANNOTATION:
 			return readJsTSTypeAnnotation(ctx, start, end);
-		case JS_TS_ENUM_DECLARATION:
-			return readJsBareExpr(ctx, 'TSEnumDeclaration', start, end);
 		case JS_TS_PARAMETER_PROPERTY:
 			return readJsBareExpr(ctx, 'TSParameterProperty', start, end);
 		case JS_TS_MODULE_DECLARATION:
 			return readJsTSModuleDeclaration(ctx, start, end);
+		case JS_TS_MODULE_BLOCK:
+			return readJsTSModuleBlock(ctx, start, end);
 		case JS_TS_AS_EXPRESSION:
 			return readJsTSAssertion(ctx, 'TSAsExpression', start, end, true);
 		case JS_TS_SATISFIES_EXPRESSION:
@@ -978,11 +984,18 @@ function readJsBareExpr(ctx, typeName, start, end) {
 function readJsImportExpression(ctx, start, end) {
 	const loc = readTypedLoc(ctx);
 	const source = readNode(ctx);
+	const options = readChildArray(ctx);
+	const ts = readBool(ctx);
 	const node = { type: 'ImportExpression', start, end };
 	if (loc !== null) node.loc = loc;
 	node.source = source;
-	// The upstream serializer also adds `options: null`. Match that.
-	node.options = null;
+	// acorn-typescript spells the second argument as an `arguments` list and
+	// omits the key when there is none; acorn always writes `options`.
+	if (ts) {
+		if (options.length > 0) node.arguments = options;
+	} else {
+		node.options = options.length > 0 ? options[0] : null;
+	}
 	return node;
 }
 
@@ -1198,18 +1211,24 @@ function readJsFunctionDeclaration(ctx, start, end) {
 	const expression = readBool(ctx);
 	const generator = readBool(ctx);
 	const asyncFlag = readBool(ctx);
+	const declare = readBool(ctx);
 	const typeParameters = readOptTypeAnnotation(ctx);
+	const returnType = readOptTypeAnnotation(ctx);
 	const params = readChildArray(ctx);
 	const body = readOptNode(ctx);
-	const node = { type: 'FunctionDeclaration', start, end };
+	// A function with no body is a `declare function` or an overload signature,
+	// which acorn-typescript spells as `TSDeclareFunction` with no `body` key.
+	const node = { type: body === null ? 'TSDeclareFunction' : 'FunctionDeclaration', start, end };
 	if (loc !== null) node.loc = loc;
+	if (declare) node.declare = true;
 	node.id = id;
 	node.expression = expression;
 	node.generator = generator;
 	node.async = asyncFlag;
 	if (typeParameters !== null) node.typeParameters = typeParameters;
 	node.params = params;
-	node.body = body;
+	if (returnType !== null) node.returnType = returnType;
+	if (body !== null) node.body = body;
 	return node;
 }
 
@@ -1416,7 +1435,19 @@ function readJsImportDeclaration(ctx, start, end) {
 	node.specifiers = specifiers;
 	node.source = source;
 	if (importKind !== null) node.importKind = importKind;
-	node.attributes = attributes;
+	// See `readJsExportNamedDeclaration`.
+	if (importKind === null || attributes.length > 0) node.attributes = attributes;
+	return node;
+}
+
+function readJsImportAttribute(ctx, start, end) {
+	const loc = readTypedLoc(ctx);
+	const key = readNode(ctx);
+	const value = readNode(ctx);
+	const node = { type: 'ImportAttribute', start, end };
+	if (loc !== null) node.loc = loc;
+	node.key = key;
+	node.value = value;
 	return node;
 }
 
@@ -1464,15 +1495,35 @@ function readJsExportNamedDeclaration(ctx, start, end) {
 	node.specifiers = specifiers;
 	node.source = source;
 	if (exportKind !== null) node.exportKind = exportKind;
-	node.attributes = attributes;
+	// acorn always writes `attributes`; acorn-typescript writes it only where the
+	// source had a `with` clause, and `exportKind` is set for TypeScript alone.
+	if (exportKind === null || attributes.length > 0) node.attributes = attributes;
+	return node;
+}
+
+function readJsExportAllDeclaration(ctx, start, end) {
+	const loc = readTypedLoc(ctx);
+	const exported = readOptNode(ctx);
+	const source = readNode(ctx);
+	const exportKind = readOptStr(ctx);
+	const attributes = readChildArray(ctx);
+	const node = { type: 'ExportAllDeclaration', start, end };
+	if (loc !== null) node.loc = loc;
+	if (exportKind !== null) node.exportKind = exportKind;
+	node.exported = exported;
+	node.source = source;
+	// See `readJsExportNamedDeclaration`.
+	if (exportKind === null || attributes.length > 0) node.attributes = attributes;
 	return node;
 }
 
 function readJsExportDefaultDeclaration(ctx, start, end) {
 	const loc = readTypedLoc(ctx);
 	const declaration = readNode(ctx);
+	const exportKind = readOptStr(ctx);
 	const node = { type: 'ExportDefaultDeclaration', start, end };
 	if (loc !== null) node.loc = loc;
+	if (exportKind !== null) node.exportKind = exportKind;
 	node.declaration = declaration;
 	return node;
 }
@@ -1551,10 +1602,27 @@ function readJsTSTypeAnnotation(ctx, start, end) {
 
 function readJsTSModuleDeclaration(ctx, start, end) {
 	const loc = readTypedLoc(ctx);
+	const id = readOptNode(ctx);
+	const declare = readBool(ctx);
+	const global = readBool(ctx);
 	const body = readOptNode(ctx);
 	const node = { type: 'TSModuleDeclaration', start, end };
 	if (loc !== null) node.loc = loc;
+	// acorn-typescript omits both flags when false, and orders `global` before
+	// `id` and `declare` after `body`.
+	if (global) node.global = true;
+	if (id !== null) node.id = id;
 	if (body !== null) node.body = body;
+	if (declare) node.declare = true;
+	return node;
+}
+
+function readJsTSModuleBlock(ctx, start, end) {
+	const loc = readTypedLoc(ctx);
+	const body = readChildArray(ctx);
+	const node = { type: 'TSModuleBlock', start, end };
+	if (loc !== null) node.loc = loc;
+	node.body = body;
 	return node;
 }