@angular/ssr 20.0.1 → 20.1.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/ssr",
-  "version": "20.0.1",
+  "version": "20.1.0-next.0",
   "description": "Angular server side rendering utilities",
   "type": "module",
   "license": "MIT",
@@ -17,10 +17,10 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/common": "^20.0.0",
-    "@angular/core": "^20.0.0",
-    "@angular/platform-server": "^20.0.0",
-    "@angular/router": "^20.0.0"
+    "@angular/common": "^20.0.0 || ^20.1.0-next.0",
+    "@angular/core": "^20.0.0 || ^20.1.0-next.0",
+    "@angular/platform-server": "^20.0.0 || ^20.1.0-next.0",
+    "@angular/router": "^20.0.0 || ^20.1.0-next.0"
   },
   "peerDependenciesMeta": {
     "@angular/platform-server": {
@@ -29,12 +29,12 @@
   },
   "devDependencies": {
     "@angular-devkit/schematics": "workspace:*",
-    "@angular/common": "20.0.0",
-    "@angular/compiler": "20.0.0",
-    "@angular/core": "20.0.0",
-    "@angular/platform-browser": "20.0.0",
-    "@angular/platform-server": "20.0.0",
-    "@angular/router": "20.0.0",
+    "@angular/common": "20.1.0-next.0",
+    "@angular/compiler": "20.1.0-next.0",
+    "@angular/core": "20.1.0-next.0",
+    "@angular/platform-browser": "20.1.0-next.0",
+    "@angular/platform-server": "20.1.0-next.0",
+    "@angular/router": "20.1.0-next.0",
     "@schematics/angular": "workspace:*"
   },
   "sideEffects": false,

package/third_party/beasties/index.js

@@ -1023,11 +1023,8 @@ function requireNode$1 () {
 
 	function sourceOffset(inputCSS, position) {
 	  // Not all custom syntaxes support `offset` in `source.start` and `source.end`
-	  if (
-	    position &&
-	    typeof position.offset !== 'undefined'
-	  ) {
-	    return position.offset;
+	  if (position && typeof position.offset !== 'undefined') {
+	    return position.offset
 	  }
 
 	  let column = 1;
@@ -1197,14 +1194,15 @@ function requireNode$1 () {
 	    return this.parent.nodes[index + 1]
 	  }
 
-	  positionBy(opts) {
+	  positionBy(opts = {}) {
 	    let pos = this.source.start;
 	    if (opts.index) {
 	      pos = this.positionInside(opts.index);
 	    } else if (opts.word) {
-	      let inputString = ('document' in this.source.input)
-	        ? this.source.input.document
-	        : this.source.input.css;
+	      let inputString =
+	        'document' in this.source.input
+	          ? this.source.input.document
+	          : this.source.input.css;
 	      let stringRepresentation = inputString.slice(
 	        sourceOffset(inputString, this.source.start),
 	        sourceOffset(inputString, this.source.end)
@@ -1218,9 +1216,10 @@ function requireNode$1 () {
 	  positionInside(index) {
 	    let column = this.source.start.column;
 	    let line = this.source.start.line;
-	    let inputString = ('document' in this.source.input)
-	      ? this.source.input.document
-	      : this.source.input.css;
+	    let inputString =
+	      'document' in this.source.input
+	        ? this.source.input.document
+	        : this.source.input.css;
 	    let offset = sourceOffset(inputString, this.source.start);
 	    let end = offset + index;
 
@@ -1233,7 +1232,7 @@ function requireNode$1 () {
 	      }
 	    }
 
-	    return { column, line }
+	    return { column, line, offset: end }
 	  }
 
 	  prev() {
@@ -1242,25 +1241,36 @@ function requireNode$1 () {
 	    return this.parent.nodes[index - 1]
 	  }
 
-	  rangeBy(opts) {
+	  rangeBy(opts = {}) {
+	    let inputString =
+	      'document' in this.source.input
+	        ? this.source.input.document
+	        : this.source.input.css;
 	    let start = {
 	      column: this.source.start.column,
-	      line: this.source.start.line
+	      line: this.source.start.line,
+	      offset: sourceOffset(inputString, this.source.start)
 	    };
 	    let end = this.source.end
 	      ? {
 	          column: this.source.end.column + 1,
-	          line: this.source.end.line
+	          line: this.source.end.line,
+	          offset:
+	            typeof this.source.end.offset === 'number'
+	              ? // `source.end.offset` is exclusive, so we don't need to add 1
+	                this.source.end.offset
+	              : // Since line/column in this.source.end is inclusive,
+	                // the `sourceOffset(... , this.source.end)` returns an inclusive offset.
+	                // So, we add 1 to convert it to exclusive.
+	                sourceOffset(inputString, this.source.end) + 1
 	        }
 	      : {
 	          column: start.column + 1,
-	          line: start.line
+	          line: start.line,
+	          offset: start.offset + 1
 	        };
 
 	    if (opts.word) {
-	      let inputString = ('document' in this.source.input)
-	        ? this.source.input.document
-	        : this.source.input.css;
 	      let stringRepresentation = inputString.slice(
 	        sourceOffset(inputString, this.source.start),
 	        sourceOffset(inputString, this.source.end)
@@ -1268,15 +1278,14 @@ function requireNode$1 () {
 	      let index = stringRepresentation.indexOf(opts.word);
 	      if (index !== -1) {
 	        start = this.positionInside(index);
-	        end = this.positionInside(
-	          index + opts.word.length,
-	        );
+	        end = this.positionInside(index + opts.word.length);
 	      }
 	    } else {
 	      if (opts.start) {
 	        start = {
 	          column: opts.start.column,
-	          line: opts.start.line
+	          line: opts.start.line,
+	          offset: sourceOffset(inputString, opts.start)
 	        };
 	      } else if (opts.index) {
 	        start = this.positionInside(opts.index);
@@ -1285,7 +1294,8 @@ function requireNode$1 () {
 	      if (opts.end) {
 	        end = {
 	          column: opts.end.column,
-	          line: opts.end.line
+	          line: opts.end.line,
+	          offset: sourceOffset(inputString, opts.end)
 	        };
 	      } else if (typeof opts.endIndex === 'number') {
 	        end = this.positionInside(opts.endIndex);
@@ -1298,7 +1308,11 @@ function requireNode$1 () {
 	      end.line < start.line ||
 	      (end.line === start.line && end.column <= start.column)
 	    ) {
-	      end = { column: start.column + 1, line: start.line };
+	      end = {
+	        column: start.column + 1,
+	        line: start.line,
+	        offset: start.offset + 1
+	      };
 	    }
 
 	    return { end, start }
@@ -1373,6 +1387,7 @@ function requireNode$1 () {
 	      } else if (typeof value === 'object' && value.toJSON) {
 	        fixed[name] = value.toJSON(null, inputs);
 	      } else if (name === 'source') {
+	        if (value == null) continue
 	        let inputId = inputs.get(value.input);
 	        if (inputId == null) {
 	          inputId = inputsNextIndex;
@@ -1412,7 +1427,7 @@ function requireNode$1 () {
 	    return result
 	  }
 
-	  warn(result, text, opts) {
+	  warn(result, text, opts = {}) {
 	    let data = { node: this };
 	    for (let i in opts) data[i] = opts[i];
 	    return result.warn(text, data)
@@ -2217,11 +2232,26 @@ function requireInput () {
 	let PreviousMap = requirePreviousMap();
 	let terminalHighlight = require$$2;
 
-	let fromOffsetCache = Symbol('fromOffsetCache');
+	let lineToIndexCache = Symbol('lineToIndexCache');
 
 	let sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator);
 	let pathAvailable = Boolean(resolve && isAbsolute);
 
+	function getLineToIndex(input) {
+	  if (input[lineToIndexCache]) return input[lineToIndexCache]
+	  let lines = input.css.split('\n');
+	  let lineToIndex = new Array(lines.length);
+	  let prevIndex = 0;
+
+	  for (let i = 0, l = lines.length; i < l; i++) {
+	    lineToIndex[i] = prevIndex;
+	    prevIndex += lines[i].length + 1;
+	  }
+
+	  input[lineToIndexCache] = lineToIndex;
+	  return lineToIndex
+	}
+
 	class Input {
 	  get from() {
 	    return this.file || this.id
@@ -2276,31 +2306,38 @@ function requireInput () {
 	  }
 
 	  error(message, line, column, opts = {}) {
-	    let endColumn, endLine, result;
+	    let endColumn, endLine, endOffset, offset, result;
 
 	    if (line && typeof line === 'object') {
 	      let start = line;
 	      let end = column;
 	      if (typeof start.offset === 'number') {
-	        let pos = this.fromOffset(start.offset);
+	        offset = start.offset;
+	        let pos = this.fromOffset(offset);
 	        line = pos.line;
 	        column = pos.col;
 	      } else {
 	        line = start.line;
 	        column = start.column;
+	        offset = this.fromLineAndColumn(line, column);
 	      }
 	      if (typeof end.offset === 'number') {
-	        let pos = this.fromOffset(end.offset);
+	        endOffset = end.offset;
+	        let pos = this.fromOffset(endOffset);
 	        endLine = pos.line;
 	        endColumn = pos.col;
 	      } else {
 	        endLine = end.line;
 	        endColumn = end.column;
+	        endOffset = this.fromLineAndColumn(end.line, end.column);
 	      }
 	    } else if (!column) {
-	      let pos = this.fromOffset(line);
+	      offset = line;
+	      let pos = this.fromOffset(offset);
 	      line = pos.line;
 	      column = pos.col;
+	    } else {
+	      offset = this.fromLineAndColumn(line, column);
 	    }
 
 	    let origin = this.origin(line, column, endLine, endColumn);
@@ -2328,7 +2365,7 @@ function requireInput () {
 	      );
 	    }
 
-	    result.input = { column, endColumn, endLine, line, source: this.css };
+	    result.input = { column, endColumn, endLine, endOffset, line, offset, source: this.css };
 	    if (this.file) {
 	      if (pathToFileURL) {
 	        result.input.url = pathToFileURL(this.file).toString();
@@ -2339,23 +2376,15 @@ function requireInput () {
 	    return result
 	  }
 
-	  fromOffset(offset) {
-	    let lastLine, lineToIndex;
-	    if (!this[fromOffsetCache]) {
-	      let lines = this.css.split('\n');
-	      lineToIndex = new Array(lines.length);
-	      let prevIndex = 0;
-
-	      for (let i = 0, l = lines.length; i < l; i++) {
-	        lineToIndex[i] = prevIndex;
-	        prevIndex += lines[i].length + 1;
-	      }
+	  fromLineAndColumn(line, column) {
+	    let lineToIndex = getLineToIndex(this);
+	    let index = lineToIndex[line - 1];
+	    return index + column - 1
+	  }
 
-	      this[fromOffsetCache] = lineToIndex;
-	    } else {
-	      lineToIndex = this[fromOffsetCache];
-	    }
-	    lastLine = lineToIndex[lineToIndex.length - 1];
+	  fromOffset(offset) {
+	    let lineToIndex = getLineToIndex(this);
+	    let lastLine = lineToIndex[lineToIndex.length - 1];
 
 	    let min = 0;
 	    if (offset >= lastLine) {
@@ -4075,7 +4104,7 @@ function requireResult () {
 	    this.messages = [];
 	    this.root = root;
 	    this.opts = opts;
-	    this.css = undefined;
+	    this.css = '';
 	    this.map = undefined;
 	  }
 
@@ -4846,7 +4875,7 @@ function requireProcessor () {
 
 	class Processor {
 	  constructor(plugins = []) {
-	    this.version = '8.5.3';
+	    this.version = '8.5.4';
 	    this.plugins = this.normalize(plugins);
 	  }