inferred-types 0.54.7 → 0.54.8

package/modules/runtime/dist/index.js

@@ -4022,26 +4022,23 @@ function ifUppercaseChar(ch, callbackForMatch, callbackForNoMatch) {
 
 // src/literals/infer.ts
 function parseTemplate(template) {
-  const pattern = /\{\{\s*infer\s+([A-Za-z_]\w*)\s*(?:as\s+(string|number|boolean)\s*)?\}\}/g;
+  const pattern = /\{\{\s*infer\s+([A-Za-z_]\w*)\s*(?:(?:extends|as)\s+(string|number|boolean)\s*)?\}\}/g;
   let lastIndex = 0;
   let match;
   const segments = [];
-  do {
-    match = pattern.exec(template);
-    if (match) {
-      const [fullMatch, varName, asType2] = match;
-      const staticPart = template.slice(lastIndex, match.index);
-      if (staticPart) {
-        segments.push({ dynamic: false, text: staticPart });
-      }
-      segments.push({
-        dynamic: true,
-        varName,
-        type: asType2 ? asType2 : "string"
-      });
-      lastIndex = match.index + fullMatch.length;
+  while (match = pattern.exec(template)) {
+    const [fullMatch, varName, asType2] = match;
+    const staticPart = template.slice(lastIndex, match.index);
+    if (staticPart) {
+      segments.push({ dynamic: false, text: staticPart });
     }
-  } while (match);
+    segments.push({
+      dynamic: true,
+      varName,
+      type: asType2 ? asType2 : "string"
+    });
+    lastIndex = match.index + fullMatch.length;
+  }
   const remainder = template.slice(lastIndex);
   if (remainder) {
     segments.push({ dynamic: false, text: remainder });
@@ -4059,19 +4056,19 @@ function buildRegexPattern(segments) {
     } else {
       switch (seg.type) {
         case "string":
-          regexStr += `(?<${seg.varName}>.*?)`;
+          regexStr += "(.*?)";
           break;
         case "number":
-          regexStr += `(?<${seg.varName}>\\d+)`;
+          regexStr += "(\\d+)";
           break;
         case "boolean":
-          regexStr += `(?<${seg.varName}>(?:true|false))`;
+          regexStr += "(true|false)";
           break;
       }
     }
   }
   regexStr += "$";
-  return new RegExp(regexStr, "s");
+  return new RegExp(regexStr);
 }
 function convertValue(type, value) {
   switch (type) {
@@ -4083,19 +4080,20 @@ function convertValue(type, value) {
       return value === "true";
   }
 }
-function matchTemplate(inference, test) {
-  const segments = parseTemplate(inference);
+function matchTemplate(template, test) {
+  const segments = parseTemplate(template);
   const regex = buildRegexPattern(segments);
-  const match = test.match(regex);
+  const match = regex.exec(test);
   if (!match)
     return false;
+  let captureIndex = 1;
   const result2 = {};
   for (const seg of segments) {
     if (seg.dynamic) {
-      const rawVal = match.groups?.[seg.varName];
+      const rawVal = match[captureIndex++];
       if (rawVal === void 0)
         return false;
-      result2[seg.varName.toLowerCase()] = convertValue(seg.type, rawVal);
+      result2[seg.varName] = convertValue(seg.type, rawVal);
     }
   }
   return result2;