@absolutejs/absolute 0.19.0-beta.739 → 0.19.0-beta.740

package/dist/angular/server.js

@@ -3462,7 +3462,18 @@ ${registrations}
   await Promise.all(entries.map(({ target }) => fs.mkdir(dirname4(target), { recursive: true })));
   await Promise.all(entries.map(({ target, content }) => fs.writeFile(target, content, "utf-8")));
   return entries.map(({ target }) => target);
-}, jitContentCache, wrapperOutputCache, escapeTemplateContent = (content) => content.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${"), resolveAngularDeferImportSpecifier = () => {
+}, jitContentCache, wrapperOutputCache, escapeTemplateContent = (content) => content.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${"), findUncommentedMatch = (source, pattern) => {
+  const re = new RegExp(pattern.source, pattern.flags.includes("g") ? pattern.flags : pattern.flags + "g");
+  let match;
+  while ((match = re.exec(source)) !== null) {
+    const lineStart = source.lastIndexOf(`
+`, match.index - 1) + 1;
+    const beforeMatch = source.slice(lineStart, match.index);
+    if (!/^\s*\/\//.test(beforeMatch))
+      return match;
+  }
+  return null;
+}, resolveAngularDeferImportSpecifier = () => {
   const sourceEntry = resolve6(import.meta.dir, "../angular/components/index.ts");
   if (existsSync5(sourceEntry)) {
     return sourceEntry.replace(/\\/g, "/");
@@ -3598,7 +3609,7 @@ ${fields}
   const content = await compileStyleFileIfNeeded(filePath, stylePreprocessors);
   return escapeTemplateContent(content);
 }, inlineTemplateAndLowerDefer = async (source, fileDir) => {
-  const templateUrlMatch = source.match(/templateUrl\s*:\s*['"]([^'"]+)['"]/);
+  const templateUrlMatch = findUncommentedMatch(source, /templateUrl\s*:\s*['"]([^'"]+)['"]/);
   if (templateUrlMatch?.[1]) {
     const templatePath = join5(fileDir, templateUrlMatch[1]);
     if (!existsSync5(templatePath)) {
@@ -3607,13 +3618,13 @@ ${fields}
     const templateRaw2 = await fs.readFile(templatePath, "utf-8");
     const lowered2 = lowerAngularDeferSyntax(templateRaw2);
     const escaped2 = escapeTemplateContent(lowered2.template);
-    const replacedSource2 = source.replace(/templateUrl\s*:\s*['"][^'"]+['"]/, `template: \`${escaped2}\``);
+    const replacedSource2 = source.slice(0, templateUrlMatch.index) + `template: \`${escaped2}\`` + source.slice(templateUrlMatch.index + templateUrlMatch[0].length);
     return {
       deferSlots: lowered2.slots,
       source: injectDeferSlotFields(replacedSource2, lowered2.slots, resolveAngularDeferImportSpecifier())
     };
   }
-  const inlineTemplateMatch = source.match(/template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/);
+  const inlineTemplateMatch = findUncommentedMatch(source, /template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/);
   if (!inlineTemplateMatch) {
     return { deferSlots: [], source };
   }
@@ -3623,13 +3634,13 @@ ${fields}
     return { deferSlots: lowered.slots, source };
   }
   const escaped = escapeTemplateContent(lowered.template);
-  const replacedSource = source.replace(/template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/, `template: \`${escaped}\``);
+  const replacedSource = source.slice(0, inlineTemplateMatch.index) + `template: \`${escaped}\`` + source.slice(inlineTemplateMatch.index + inlineTemplateMatch[0].length);
   return {
     deferSlots: lowered.slots,
     source: injectDeferSlotFields(replacedSource, lowered.slots, resolveAngularDeferImportSpecifier())
   };
 }, inlineTemplateAndLowerDeferSync = (source, fileDir) => {
-  const templateUrlMatch = source.match(/templateUrl\s*:\s*['"]([^'"]+)['"]/);
+  const templateUrlMatch = findUncommentedMatch(source, /templateUrl\s*:\s*['"]([^'"]+)['"]/);
   if (templateUrlMatch?.[1]) {
     const templatePath = join5(fileDir, templateUrlMatch[1]);
     if (!existsSync5(templatePath)) {
@@ -3638,13 +3649,13 @@ ${fields}
     const templateRaw2 = readFileSync4(templatePath, "utf-8");
     const lowered2 = lowerAngularDeferSyntax(templateRaw2);
     const escaped2 = escapeTemplateContent(lowered2.template);
-    const replacedSource2 = source.replace(/templateUrl\s*:\s*['"][^'"]+['"]/, `template: \`${escaped2}\``);
+    const replacedSource2 = source.slice(0, templateUrlMatch.index) + `template: \`${escaped2}\`` + source.slice(templateUrlMatch.index + templateUrlMatch[0].length);
     return {
       deferSlots: lowered2.slots,
       source: injectDeferSlotFields(replacedSource2, lowered2.slots, resolveAngularDeferImportSpecifier())
     };
   }
-  const inlineTemplateMatch = source.match(/template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/);
+  const inlineTemplateMatch = findUncommentedMatch(source, /template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/);
   if (!inlineTemplateMatch) {
     return { deferSlots: [], source };
   }
@@ -3654,13 +3665,13 @@ ${fields}
     return { deferSlots: lowered.slots, source };
   }
   const escaped = escapeTemplateContent(lowered.template);
-  const replacedSource = source.replace(/template\s*:\s*(`([\s\S]*?)`|'([^']*)'|"([^"]*)")/, `template: \`${escaped}\``);
+  const replacedSource = source.slice(0, inlineTemplateMatch.index) + `template: \`${escaped}\`` + source.slice(inlineTemplateMatch.index + inlineTemplateMatch[0].length);
   return {
     deferSlots: lowered.slots,
     source: injectDeferSlotFields(replacedSource, lowered.slots, resolveAngularDeferImportSpecifier())
   };
 }, inlineStyleUrls = async (source, fileDir, stylePreprocessors) => {
-  const styleUrlsMatch = source.match(/styleUrls\s*:\s*\[([^\]]+)\]/);
+  const styleUrlsMatch = findUncommentedMatch(source, /styleUrls\s*:\s*\[([^\]]+)\]/);
   if (!styleUrlsMatch?.[1])
     return source;
   const urlMatches = styleUrlsMatch[1].match(/['"]([^'"]+)['"]/g);
@@ -3674,15 +3685,15 @@ ${fields}
   const inlinedStyles = results.filter(Boolean).map((escaped) => `\`${escaped}\``);
   if (inlinedStyles.length === 0)
     return source;
-  return source.replace(/styleUrls\s*:\s*\[[^\]]+\]/, `styles: [${inlinedStyles.join(", ")}]`);
+  return source.slice(0, styleUrlsMatch.index) + `styles: [${inlinedStyles.join(", ")}]` + source.slice(styleUrlsMatch.index + styleUrlsMatch[0].length);
 }, inlineSingleStyleUrl = async (source, fileDir, stylePreprocessors) => {
-  const styleUrlMatch = source.match(/styleUrl\s*:\s*['"]([^'"]+)['"]/);
+  const styleUrlMatch = findUncommentedMatch(source, /styleUrl\s*:\s*['"]([^'"]+)['"]/);
   if (!styleUrlMatch?.[1])
     return source;
   const escaped = await readAndEscapeFile(join5(fileDir, styleUrlMatch[1]), stylePreprocessors);
   if (!escaped)
     return source;
-  return source.replace(/styleUrl\s*:\s*['"][^'"]+['"]/, `styles: [\`${escaped}\`]`);
+  return source.slice(0, styleUrlMatch.index) + `styles: [\`${escaped}\`]` + source.slice(styleUrlMatch.index + styleUrlMatch[0].length);
 }, inlineResources = async (source, fileDir, stylePreprocessors) => {
   const inlinedTemplate = await inlineTemplateAndLowerDefer(source, fileDir);
   let result = inlinedTemplate.source;
@@ -5079,5 +5090,5 @@ export {
   handleAngularPageRequest
 };
 
-//# debugId=BE57FD8D6737129D64756E2164756E21
+//# debugId=CC06E227EE05A7F464756E2164756E21
 //# sourceMappingURL=server.js.map