@gi-tcg/gts-transpiler 0.3.9 → 0.3.11

package/dist/index.js

@@ -68,8 +68,8 @@ function loosePlugin() {
 	return function loosePluginTransformer(parser) {
 		return class LooseParser extends parser {
 			_patchedParseIdent = (liberal) => {
-				if (this.type !== tokTypes.name) return this.createDummyIdentifier();
-				else return super.parseIdent(liberal);
+				if (this.type === tokTypes.name || this.type.keyword) return super.parseIdent(liberal);
+				else return this.createDummyIdentifier();
 			};
 			#proxiedThis = new Proxy(this, { get: (target, prop) => {
 				if (prop === "parseIdent") return this._patchedParseIdent;
@@ -1755,6 +1755,11 @@ function getPrintOptions(source, state) {
 					context.write("\"");
 					context.writeMapped(text.slice(1, -1), node.range[0], node.range[1], LITERAL_FROM_ID_MAPPING_DATA);
 					context.write("\"");
+					const generatedEnd = context.generatedOffset;
+					context.createExtraMapping({
+						start: node.range[0],
+						end: node.range[1]
+					}, generatedStart, generatedEnd, VERIFICATION_ONLY_MAPPING_DATA);
 				} else if (state.attributeNameNodes.has(node) && node.range) context.writeMapped(node.raw ?? JSON.stringify(node.value), node.range[0], node.range[1], ATTRIBUTE_NAME_MAPPING_DATA);
 				else if (directActionStubRange = state.directActionStubRange.get(node)) context.writeMapped(node.raw ?? JSON.stringify(node.value), directActionStubRange.start, directActionStubRange.start + 1, DIRECT_ACTION_STUB_MAPPING_DATA);
 				else defaultPrinters.Literal(node, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-transpiler",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/piovium/gts.git"

package/src/parse/loose_plugin.ts

@@ -1,7 +1,7 @@
 import { tokTypes, type Parser } from "acorn";
 import type { AST, Parse } from "../types.js";
 
-export const DUMMY_PLACEHOLDER = '✖';
+export const DUMMY_PLACEHOLDER = "✖";
 
 export function loosePlugin() {
   return function loosePluginTransformer(parser: typeof Parser): typeof Parser {
@@ -9,10 +9,10 @@ export function loosePlugin() {
       private readonly _patchedParseIdent = (
         liberal?: boolean,
       ): AST.Identifier => {
-        if (this.type !== tokTypes.name) {
-          return this.createDummyIdentifier();
-        } else {
+        if (this.type === tokTypes.name || this.type.keyword) {
           return super.parseIdent(liberal);
+        } else {
+          return this.createDummyIdentifier();
         }
       };
       readonly #proxiedThis = new Proxy(this, {
@@ -29,7 +29,10 @@ export function loosePlugin() {
       });
 
       createDummyIdentifier() {
-        const dummy = this.startNodeAt(this.lastTokEnd, this.lastTokEndLoc) as AST.Identifier;
+        const dummy = this.startNodeAt(
+          this.lastTokEnd,
+          this.lastTokEndLoc,
+        ) as AST.Identifier;
         dummy.name = DUMMY_PLACEHOLDER;
         dummy.isDummy = true;
         return this.finishNode(dummy, "Identifier");

package/src/transform/volar/printer.ts

@@ -92,6 +92,17 @@ export function getPrintOptions(
             LITERAL_FROM_ID_MAPPING_DATA,
           );
           context.write('"');
+          const generatedEnd = context.generatedOffset;
+          // Map error squiggle at quotation mark to the inner content
+          context.createExtraMapping(
+            {
+              start: node.range[0],
+              end: node.range[1],
+            },
+            generatedStart,
+            generatedEnd,
+            VERIFICATION_ONLY_MAPPING_DATA,
+          )
         } else if (state.attributeNameNodes.has(node) && node.range) {
           context.writeMapped(
             node.raw ?? JSON.stringify((node as EspolarAST.Literal).value),