@dcloudio/uni-cli-shared 3.0.0-alpha-4000020231215001 → 3.0.0-alpha-4000020231218001

package/dist/vite/plugins/vitejs/utils.d.ts

@@ -1,5 +1,6 @@
 import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping';
-import { SourceLocation } from '@vue/compiler-core';
+import { Position, SourceLocation } from '@vue/compiler-core';
+import { LinesAndColumns } from 'lines-and-columns';
 export declare function slash(p: string): string;
 export declare const bareImportRE: RegExp;
 export declare const deepImportRE: RegExp;
@@ -21,6 +22,7 @@ export declare function offsetToLineColumn(source: string, offset: number): {
     line: number;
     column: number;
 };
+export declare function offsetToLineColumnByLines(lines: LinesAndColumns, offset: number): Position;
 export declare function posToNumber(source: string, pos: number | {
     line: number;
     column: number;

package/dist/vite/plugins/vitejs/utils.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.locToStartAndEnd = exports.posToNumber = exports.offsetToLineColumn = exports.offsetToStartAndEnd = exports.pad = exports.isObject = exports.asyncReplace = exports.multilineCommentsRE = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
+exports.combineSourcemaps = exports.processSrcSet = exports.generateCodeFrame = exports.locToStartAndEnd = exports.posToNumber = exports.offsetToLineColumnByLines = exports.offsetToLineColumn = exports.offsetToStartAndEnd = exports.pad = exports.isObject = exports.asyncReplace = exports.multilineCommentsRE = exports.isDataUrl = exports.dataUrlRE = exports.isExternalUrl = exports.externalRE = exports.cleanUrl = exports.hashRE = exports.queryRE = exports.normalizePath = exports.isWindows = exports.deepImportRE = exports.bareImportRE = exports.slash = void 0;
 /**
  * https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
  */
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const remapping_1 = __importDefault(require("@ampproject/remapping"));
+const lines_and_columns_1 = require("lines-and-columns");
 function slash(p) {
     return p.replace(/\\/g, '/');
 }
@@ -57,7 +58,7 @@ function pad(source, n = 2) {
 }
 exports.pad = pad;
 function offsetToStartAndEnd(source, startOffset, endOffset) {
-    const lines = source.split(splitRE);
+    const lines = new lines_and_columns_1.LinesAndColumns(source);
     return {
         start: offsetToLineColumnByLines(lines, startOffset),
         end: offsetToLineColumnByLines(lines, endOffset),
@@ -65,39 +66,31 @@ function offsetToStartAndEnd(source, startOffset, endOffset) {
     };
 }
 exports.offsetToStartAndEnd = offsetToStartAndEnd;
-function offsetToLineColumnByLines(lines, offset) {
-    let currentOffset = 0;
-    for (let i = 0; i < lines.length; i++) {
-        const lineLength = lines[i].length + 1; // Adding 1 for the newline character
-        if (currentOffset + lineLength > offset) {
-            const line = i + 1; // Line numbers start from 1
-            const column = offset - currentOffset; // Column numbers start from 0
-            return { line, column, offset };
-        }
-        currentOffset += lineLength;
-    }
-    return { line: lines.length, column: lines[lines.length - 1].length, offset };
-}
 function offsetToLineColumn(source, offset) {
-    return offsetToLineColumnByLines(source.split(splitRE), offset);
+    return offsetToLineColumnByLines(new lines_and_columns_1.LinesAndColumns(source), offset);
 }
 exports.offsetToLineColumn = offsetToLineColumn;
+function offsetToLineColumnByLines(lines, offset) {
+    let location = lines.locationForIndex(offset);
+    if (!location) {
+        location = lines.locationForIndex(offset);
+    }
+    // lines-and-columns is 0-indexed while positions are 1-indexed
+    return { line: location.line + 1, column: location.column, offset: 0 };
+}
+exports.offsetToLineColumnByLines = offsetToLineColumnByLines;
 function posToNumber(source, pos) {
     if (typeof pos === 'number')
         return pos;
-    const lines = source.split(splitRE);
-    return posToNumberByLines(lines, pos.line, pos.column);
+    return posToNumberByLines(new lines_and_columns_1.LinesAndColumns(source), pos.line, pos.column);
 }
 exports.posToNumber = posToNumber;
 function posToNumberByLines(lines, line, column) {
-    let start = 0;
-    for (let i = 0; i < line - 1; i++) {
-        start += lines[i].length + 1;
-    }
-    return start + column;
+    // lines-and-columns is 0-indexed while positions are 1-indexed
+    return lines.indexForLocation({ line: line - 1, column }) || 0;
 }
 function locToStartAndEnd(source, loc) {
-    const lines = source.split(splitRE);
+    const lines = new lines_and_columns_1.LinesAndColumns(source);
     const start = posToNumberByLines(lines, loc.start.line, loc.start.column);
     const end = loc.end
         ? posToNumberByLines(lines, loc.end.line, loc.end.column)

package/dist/vite/utils/utils.d.ts

@@ -1,7 +1,9 @@
 import type { ConfigEnv, ResolvedConfig, UserConfig } from 'vite';
 import { RollupError } from 'rollup';
 import { CompilerError } from '@vue/compiler-sfc';
+import { codeFrameColumns } from '@babel/code-frame';
 export declare function withSourcemap(config: ResolvedConfig): boolean;
 export declare function isInHybridNVue(config: UserConfig | ResolvedConfig): boolean;
 export declare function isSsr(command: ConfigEnv['command'], config: UserConfig | ResolvedConfig): boolean;
 export declare function createRollupError(plugin: string, id: string, error: CompilerError | SyntaxError, source?: string): RollupError;
+export declare const generateCodeFrameColumns: typeof codeFrameColumns;

package/dist/vite/utils/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRollupError = exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
-const utils_1 = require("../plugins/vitejs/utils");
+exports.generateCodeFrameColumns = exports.createRollupError = exports.isSsr = exports.isInHybridNVue = exports.withSourcemap = void 0;
 const shared_1 = require("@vue/shared");
+const code_frame_1 = require("@babel/code-frame");
+const utils_1 = require("../plugins/vitejs/utils");
 function withSourcemap(config) {
     if (config.command === 'serve') {
         return true;
@@ -40,11 +41,10 @@ function createRollupError(plugin, id, error, source) {
         };
         if (source && source.length > 0) {
             if ('offsetStart' in error && 'offsetEnd' in error) {
-                rollupError.frame = (0, utils_1.generateCodeFrame)(source, error.offsetStart, error.offsetEnd).replace(/\t/g, ' ');
+                rollupError.frame = (0, code_frame_1.codeFrameColumns)(source, (0, utils_1.offsetToStartAndEnd)(source, error.offsetStart, error.offsetEnd));
             }
             else {
-                const { start, end } = (0, utils_1.locToStartAndEnd)(source, error.loc);
-                rollupError.frame = (0, utils_1.generateCodeFrame)(source, start, end).replace(/\t/g, ' ');
+                rollupError.frame = (0, code_frame_1.codeFrameColumns)(source, error.loc);
             }
         }
     }
@@ -60,3 +60,4 @@ function createRollupError(plugin, id, error, source) {
     return rollupError;
 }
 exports.createRollupError = createRollupError;
+exports.generateCodeFrameColumns = code_frame_1.codeFrameColumns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4000020231215001",
+  "version": "3.0.0-alpha-4000020231218001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,12 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
+    "@babel/code-frame": "^7.23.5",
     "@babel/core": "^7.21.3",
     "@babel/parser": "^7.23.5",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4000020231215001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4000020231215001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4000020231218001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4000020231218001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -48,6 +49,7 @@
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.2.0",
+    "lines-and-columns": "^2.0.4",
     "magic-string": "^0.30.0",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
@@ -64,7 +66,8 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000020231215001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4000020231218001",
+    "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",
@@ -76,6 +79,7 @@
     "@types/resolve": "^1.20.2",
     "@types/sass": "^1.43.1",
     "@types/stylus": "^0.48.36",
+    "code-frame": "link:@types/@babel/code-frame",
     "postcss": "^8.4.21",
     "unplugin-auto-import": "^0.16.7",
     "vue": "3.3.11"