diff --git a/jest.config.js b/jest.config.js index 5acf49c6d536d6777f732aefcb11f75fa03b92a5..f5de6fad3e71530dd29dd00f270370f7b80e5acc 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,18 +10,6 @@ module.exports = { __GLOBAL__: false, __VUE_OPTIONS_API__: true, __VUE_PROD_DEVTOOLS__: false, - uni: { - requireNativePlugin(name) { - return { - invokeSync(args, callback) { - console.log(`invoke`, JSON.stringify(args)) - }, - invokeAsync(args, callback) { - console.log(`invokeAsync`, JSON.stringify(args)) - }, - } - }, - }, }, coverageDirectory: 'coverage', coverageReporters: ['html', 'lcov', 'text'], diff --git a/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts b/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts index 247209d5b95a71047cd20163bfe6102c4b403768..9a0d28c9faa2dabb21a69d4e78251dfc4195ff73 100644 --- a/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts +++ b/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts @@ -1,20 +1,8 @@ -import IUniLogin from '../interface' -import { OnConnect, RegisterOptions } from '../interface' - -export default class UniLogin implements IUniLogin { - //@UniJSMethod({ uiThread: true }) - - override login(name, code) { - console.log(name, code) - } - - // {"name":"fxy","callback1":{__type__:"fun",id:1},"callback2":{__type__:"fun",id:1}} - // => RegisterOptions - async register(opts: RegisterOptions) { - opts.callback1(true) - opts.callback2(true) - opts.abc.callback3(true) +export function login(name: string, pwd: string) { + return { name, pwd } +} +export class User { + async login(name: string, pwd: string) { + return { name, pwd } } - - override onConnect(callback: OnConnect) {} } diff --git a/packages/playground/uts/uni_modules/test-uniplugin/interface.uts b/packages/playground/uts/uni_modules/test-uniplugin/interface.uts index 882817b3cc20e77c04a31c4ba36bfd2055e28ed0..d4390ce944f2c018edc6458f363c0860486d13dd 100644 --- a/packages/playground/uts/uni_modules/test-uniplugin/interface.uts +++ b/packages/playground/uts/uni_modules/test-uniplugin/interface.uts @@ -1,16 +1,4 @@ -export type RegisterOptions = { - name: string - callback1: (res: boolean) => void - callback2: (res: boolean) => void - abc: { - callback3: (res: boolean) => void - } -} - -export type OnConnect = () => void - -export default interface IUniLogin { - login: (name: string, code: number) => void - register: (opts: RegisterOptions) => Promise - onConnect: (callback: OnConnect) => void +export declare function login(name: string, pwd: string): void +export declare class User { + login(name: string, pwd: string): void } diff --git a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt index 19e00fe173939256e5a6d2cab1b3c95f3b02b04f..4d6ac5b29808e0751ed63c377dd66777f3c614c5 100644 --- a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt +++ b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/android/app-android/index.kt @@ -1,15 +1,15 @@ package index; -import ...interface.interface as IUniLogin; -import ...interface.OnConnect; -import ...interface.RegisterOptions; -open class UniLogin : IUniLogin { - override fun login(name, code) { - console.log(name, code); - } - open fun async register(opts: RegisterOptions) { - opts.callback1(true); - opts.callback2(true); - opts.abc.callback3(true); +fun login(name: String, pwd: String): UtsJSONObject { + return object : () { + var name = name + var pwd = pwd + }; +} +open class User { + open fun async login(name: String, pwd: String) { + return object : () { + var name = name + var pwd = pwd + }; } - override fun onConnect(callback: OnConnect) {} } diff --git a/packages/shims-node.d.ts b/packages/shims-node.d.ts index b9d4a0d0ed0b106018e3e295b9fbd7de9f054dad..604c8462b9fa7c8b601ee2e5a1eeb070e9df38d2 100644 --- a/packages/shims-node.d.ts +++ b/packages/shims-node.d.ts @@ -7,6 +7,8 @@ declare namespace NodeJS { UNI_NODE_ENV: 'production' | 'development' | 'test' UNI_PLATFORM: UniApp.PLATFORM UNI_SUB_PLATFORM: 'quickapp-webview-huawei' | 'quickapp-webview-union' + UNI_APP_PLATFORM: 'app-android' | 'app-ios' + UNI_INPUT_DIR: string UNI_OUTPUT_DIR: string UNI_CLI_CONTEXT: string diff --git a/packages/uni-app-plus/dist/uni.runtime.esm.js b/packages/uni-app-plus/dist/uni.runtime.esm.js index 0a7cf0976b76af72cf31ed6af3a5410c2c274a3d..9225e789612ed93b96f1756e668bc4293742affb 100644 --- a/packages/uni-app-plus/dist/uni.runtime.esm.js +++ b/packages/uni-app-plus/dist/uni.runtime.esm.js @@ -11468,6 +11468,8 @@ const API_GET_SYSTEM_SETTING = 'getSystemSetting'; const API_GET_APP_AUTHORIZE_SETTING = 'getAppAuthorizeSetting'; +const API_OPEN_APP_AUTHORIZE_SETTING = 'openAppAuthorizeSetting'; + const API_GET_STORAGE = 'getStorage'; const GetStorageProtocol = { key: { @@ -14125,6 +14127,19 @@ const getAppAuthorizeSetting = defineSyncApi(API_GET_APP_AUTHORIZE_SETTING, () = return appAuthorizeSetting; }); +const openAppAuthorizeSetting = defineAsyncApi(API_OPEN_APP_AUTHORIZE_SETTING, (_, { resolve, reject }) => { + const { openAppAuthorizeSetting } = weex.requireModule('plus'); + const fn = openAppAuthorizeSetting; + fn((ret) => { + if (ret.type === 'success') { + resolve(); + } + else { + reject(); + } + }); +}); + const getImageInfo = defineAsyncApi(API_GET_IMAGE_INFO, (options, { resolve, reject }) => { const path = TEMP_PATH + '/download/'; plus.io.getImageInfo(extend(options, { @@ -15962,7 +15977,9 @@ const chooseLocation = defineAsyncApi(API_CHOOSE_LOCATION, (options, { resolve, let result; const page = showPage({ url: '__uniappchooselocation', - data: options, + data: extend({}, options, { + locale: getLocale(), + }), style: { // @ts-expect-error animationType: options.animationType || 'slide-in-bottom', @@ -15999,7 +16016,9 @@ const chooseLocation = defineAsyncApi(API_CHOOSE_LOCATION, (options, { resolve, const openLocation = defineAsyncApi(API_OPEN_LOCATION, (data, { resolve, reject }) => { showPage({ url: '__uniappopenlocation', - data, + data: extend({}, data, { + locale: getLocale(), + }), style: { titleNView: { type: 'transparent', @@ -19227,6 +19246,7 @@ var uni$1 = { getWindowInfo: getWindowInfo, getSystemSetting: getSystemSetting, getAppAuthorizeSetting: getAppAuthorizeSetting, + openAppAuthorizeSetting: openAppAuthorizeSetting, getImageInfo: getImageInfo, getVideoInfo: getVideoInfo, previewImage: previewImage, diff --git a/packages/uni-app/__tests__/module.spec.ts b/packages/uni-app/__tests__/module.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..65df4538e7152643fb78005c93ad8a3701168b48 --- /dev/null +++ b/packages/uni-app/__tests__/module.spec.ts @@ -0,0 +1,83 @@ +import { + normalizeArg, + initUtsProxyFunction, + initUtsProxyClass, +} from '../src/uts' + +describe('uts-module', () => { + test('normalize args', () => { + expect(normalizeArg(1)).toBe(1) + expect(normalizeArg('hello')).toBe('hello') + expect(normalizeArg(true)).toBe(true) + expect(normalizeArg({ callback: () => {} })).toEqual({ + callback: 1, + }) + expect( + normalizeArg({ success: () => {}, fail: () => {}, complete: () => {} }) + ).toEqual({ + success: 2, + fail: 3, + complete: 4, + }) + expect( + normalizeArg({ + user: { + name: 'test', + age: 10, + callback() {}, + }, + success() {}, + }) + ).toEqual({ + user: { + name: 'test', + age: 10, + callback: 5, + }, + success: 6, + }) + }) + test(`initProxyFunction`, () => { + ;[true, false].forEach((async) => { + const preparePermission = initUtsProxyFunction({ + pkg: 'testPlugin', + cls: '', + method: 'preparePermission', + async, + }) + /** + * {"package":"testPlugin","class":"","method":"preparePermission","params":[{"name":"foo","age":10,"success":7,"fail":8},9]} + */ + preparePermission( + { + family: { + father: 'f', + mother: 'm', + }, + name: 'foo', + age: 10, + success(res: any) { + console.log('success', res) + }, + fail(res: any) { + console.log('fail', res) + }, + }, + (res: any) => { + console.log('callback', res) + } + ) + }) + }) + test(`initProxyClass`, () => { + const WifiManager = initUtsProxyClass({ + pkg: 'testPlugin', + cls: 'WifiManager', + methods: { + preparePermission: {}, + }, + }) + const wifi = new WifiManager() + wifi.preparePermission(1, 2, 3, () => {}) + }) +}) diff --git a/packages/uni-app/dist/uni-app.cjs.js b/packages/uni-app/dist/uni-app.cjs.js index c5b894041497b9c4e46e7d291da4771f64c5f299..b974ae7efc71b97373c840a30f60b8b3c1d555a2 100644 --- a/packages/uni-app/dist/uni-app.cjs.js +++ b/packages/uni-app/dist/uni-app.cjs.js @@ -11,12 +11,12 @@ function assertKey(key, shallow = false) { throw new Error(`${shallow ? 'shallowSsrRef' : 'ssrRef'}: You must provide a key.`); } } -function proxy(target, track, trigger) { +function proxy$1(target, track, trigger) { return new Proxy(target, { get(target, prop) { track(); if (shared.isObject(target[prop])) { - return proxy(target[prop], track, trigger); + return proxy$1(target[prop], track, trigger); } return Reflect.get(target, prop); }, @@ -48,7 +48,7 @@ const ssrServerRef = (value, key, shallow = false) => { get: () => { track(); if (!shallow && shared.isObject(value)) { - return proxy(value, track, customTrigger); + return proxy$1(value, track, customTrigger); } return value; }, @@ -135,8 +135,91 @@ const onNavigationBarSearchInputConfirmed = const onNavigationBarSearchInputFocusChanged = /*#__PURE__*/ createHook(uniShared.ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED); +let callbackId = 1; +let proxy; +const callbacks = {}; +function normalizeArg(arg) { + if (typeof arg === 'function') { + const id = callbackId++; + callbacks[id] = arg; + return id; + } + else if (shared.isPlainObject(arg)) { + Object.keys(arg).forEach((name) => { + arg[name] = normalizeArg(arg[name]); + }); + } + return arg; +} +function isProxyInvokeCallbackResponse(res) { + return !!res.name; +} +function initUtsProxyFunction({ pkg, cls, method, async, }) { + const invokeCallback = ({ id, name, params, keepAlive, }) => { + const callback = callbacks[id]; + if (callback) { + callback(...params); + if (!keepAlive) { + delete callbacks[id]; + } + } + else { + console.error(`${pkg}${cls ? '.' + cls : ''}.${method} ${name} is not found`); + } + }; + return (...args) => { + if (!proxy) { + proxy = uni.requireNativePlugin('ProxyModule'); + } + const params = args.map((arg) => normalizeArg(arg)); + const invokeArgs = { package: pkg, class: cls, method, params }; + if (async) { + return new Promise((resolve, reject) => { + proxy.invokeAsync(invokeArgs, (res) => { + if (isProxyInvokeCallbackResponse(res)) { + invokeCallback(res); + } + else { + if (res.errMsg) { + reject(res.errMsg); + } + else { + resolve(res.params); + } + } + }); + }); + } + return proxy.invokeSync(invokeArgs, invokeCallback); + }; +} +function initUtsProxyClass({ pkg, cls, methods, }) { + return class ProxyClass { + constructor() { + const target = {}; + return new Proxy(this, { + get(_, method) { + if (!target[method]) { + if (shared.hasOwn(methods, method)) { + target[method] = initUtsProxyFunction({ + pkg, + cls, + method, + async: methods[method].async, + }); + } + return target[method]; + } + }, + }); + } + }; +} + exports.getCurrentSubNVue = getCurrentSubNVue; exports.getSsrGlobalData = getSsrGlobalData; +exports.initUtsProxyClass = initUtsProxyClass; +exports.initUtsProxyFunction = initUtsProxyFunction; exports.onAddToFavorites = onAddToFavorites; exports.onBackPress = onBackPress; exports.onError = onError; diff --git a/packages/uni-app/dist/uni-app.d.ts b/packages/uni-app/dist/uni-app.d.ts index 55426382845c91241ae57aa92153f2c3f7ccc97a..37112b2963c55bee091fa6c06bd329aaa87f6710 100644 --- a/packages/uni-app/dist/uni-app.d.ts +++ b/packages/uni-app/dist/uni-app.d.ts @@ -35,6 +35,10 @@ export declare function getCurrentSubNVue(): any; export declare function getSsrGlobalData(): any; +export declare function initUtsProxyClass({ pkg, cls, methods, }: ProxyClassOptions): any; + +export declare function initUtsProxyFunction({ pkg, cls, method, async, }: ProxyFunctionOptions): (...args: unknown[]) => any; + declare type LaunchOption = LaunchShowOption; declare interface LaunchShowOption { @@ -161,6 +165,26 @@ declare interface PageScrollOption { scrollTop: number; } +declare interface ProxyBaseOptions { + pkg: string; + cls: string; + method: string; +} + +declare interface ProxyClassOptions { + pkg: string; + cls: string; + methods: { + [name: string]: { + async?: boolean; + }; + }; +} + +declare interface ProxyFunctionOptions extends ProxyBaseOptions { + async?: boolean; +} + declare interface ReferrerInfo { appId: string; extraData?: any; diff --git a/packages/uni-app/dist/uni-app.es.js b/packages/uni-app/dist/uni-app.es.js index 7c91ededeb67f9e4ed9e98e1089fdd8b5377b814..522f535d5f41aed35ae1e2b971c74724b5182a54 100644 --- a/packages/uni-app/dist/uni-app.es.js +++ b/packages/uni-app/dist/uni-app.es.js @@ -1,5 +1,5 @@ import { shallowRef, ref, getCurrentInstance, isInSSRComponentSetup, injectHook } from 'vue'; -import { hasOwn, isString } from '@vue/shared'; +import { hasOwn, isString, isPlainObject } from '@vue/shared'; import { sanitise, UNI_SSR_DATA, UNI_SSR_GLOBAL_DATA, UNI_SSR, ON_SHOW, ON_HIDE, ON_LAUNCH, ON_ERROR, ON_THEME_CHANGE, ON_PAGE_NOT_FOUND, ON_UNHANDLE_REJECTION, ON_INIT, ON_LOAD, ON_READY, ON_UNLOAD, ON_RESIZE, ON_BACK_PRESS, ON_PAGE_SCROLL, ON_TAB_ITEM_TAP, ON_REACH_BOTTOM, ON_PULL_DOWN_REFRESH, ON_SAVE_EXIT_STATE, ON_SHARE_TIMELINE, ON_ADD_TO_FAVORITES, ON_SHARE_APP_MESSAGE, ON_NAVIGATION_BAR_BUTTON_TAP, ON_NAVIGATION_BAR_SEARCH_INPUT_CHANGED, ON_NAVIGATION_BAR_SEARCH_INPUT_CLICKED, ON_NAVIGATION_BAR_SEARCH_INPUT_CONFIRMED, ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED } from '@dcloudio/uni-shared'; function getSSRDataType() { @@ -103,4 +103,85 @@ const onNavigationBarSearchInputConfirmed = const onNavigationBarSearchInputFocusChanged = /*#__PURE__*/ createHook(ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED); -export { getCurrentSubNVue, getSsrGlobalData, onAddToFavorites, onBackPress, onError, onHide, onInit, onLaunch, onLoad, onNavigationBarButtonTap, onNavigationBarSearchInputChanged, onNavigationBarSearchInputClicked, onNavigationBarSearchInputConfirmed, onNavigationBarSearchInputFocusChanged, onPageNotFound, onPageScroll, onPullDownRefresh, onReachBottom, onReady, onResize, onSaveExitState, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onThemeChange, onUnhandledRejection, onUnload, requireNativePlugin, resolveEasycom, shallowSsrRef, ssrRef }; +let callbackId = 1; +let proxy; +const callbacks = {}; +function normalizeArg(arg) { + if (typeof arg === 'function') { + const id = callbackId++; + callbacks[id] = arg; + return id; + } + else if (isPlainObject(arg)) { + Object.keys(arg).forEach((name) => { + arg[name] = normalizeArg(arg[name]); + }); + } + return arg; +} +function isProxyInvokeCallbackResponse(res) { + return !!res.name; +} +function initUtsProxyFunction({ pkg, cls, method, async, }) { + const invokeCallback = ({ id, name, params, keepAlive, }) => { + const callback = callbacks[id]; + if (callback) { + callback(...params); + if (!keepAlive) { + delete callbacks[id]; + } + } + else { + console.error(`${pkg}${cls ? '.' + cls : ''}.${method} ${name} is not found`); + } + }; + return (...args) => { + if (!proxy) { + proxy = uni.requireNativePlugin('ProxyModule'); + } + const params = args.map((arg) => normalizeArg(arg)); + const invokeArgs = { package: pkg, class: cls, method, params }; + if (async) { + return new Promise((resolve, reject) => { + proxy.invokeAsync(invokeArgs, (res) => { + if (isProxyInvokeCallbackResponse(res)) { + invokeCallback(res); + } + else { + if (res.errMsg) { + reject(res.errMsg); + } + else { + resolve(res.params); + } + } + }); + }); + } + return proxy.invokeSync(invokeArgs, invokeCallback); + }; +} +function initUtsProxyClass({ pkg, cls, methods, }) { + return class ProxyClass { + constructor() { + const target = {}; + return new Proxy(this, { + get(_, method) { + if (!target[method]) { + if (hasOwn(methods, method)) { + target[method] = initUtsProxyFunction({ + pkg, + cls, + method, + async: methods[method].async, + }); + } + return target[method]; + } + }, + }); + } + }; +} + +export { getCurrentSubNVue, getSsrGlobalData, initUtsProxyClass, initUtsProxyFunction, onAddToFavorites, onBackPress, onError, onHide, onInit, onLaunch, onLoad, onNavigationBarButtonTap, onNavigationBarSearchInputChanged, onNavigationBarSearchInputClicked, onNavigationBarSearchInputConfirmed, onNavigationBarSearchInputFocusChanged, onPageNotFound, onPageScroll, onPullDownRefresh, onReachBottom, onReady, onResize, onSaveExitState, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onThemeChange, onUnhandledRejection, onUnload, requireNativePlugin, resolveEasycom, shallowSsrRef, ssrRef }; diff --git a/packages/uni-app/src/index.ts b/packages/uni-app/src/index.ts index df3157569cb8db71ad326971dea52a8f2be04385..bc9e060c1f4617dc0e61ed105f92c3db3df71120 100644 --- a/packages/uni-app/src/index.ts +++ b/packages/uni-app/src/index.ts @@ -2,3 +2,4 @@ export * from './ssr' export * from './api' export * from './utils' export * from './apiLifecycle' +export { initUtsProxyClass, initUtsProxyFunction } from './uts' diff --git a/packages/uni-uts-vite/module.ts b/packages/uni-app/src/uts.ts similarity index 53% rename from packages/uni-uts-vite/module.ts rename to packages/uni-app/src/uts.ts index 7b632c4a05e20e0183fc76785f166f33ab27816d..f8aad32c84581e02c3775b341f6cd3fba9b55ea0 100644 --- a/packages/uni-uts-vite/module.ts +++ b/packages/uni-app/src/uts.ts @@ -1,28 +1,7 @@ -declare const uni: { - requireNativePlugin(name: string): { invoke: Function } -} - -const moduleName = '__MODULE_NAME__' - -const moduleDefine = '__MODULE_DEFINE__' as unknown as Record< - string, - ModuleMethodDefine -> - -interface ModuleMethodDefine { - async?: boolean -} - -export default initModule(moduleName, moduleDefine) - +import { isPlainObject, hasOwn } from '@vue/shared' +declare const uni: any let callbackId = 1 - -const objectToString = Object.prototype.toString -const toTypeString = (value: unknown): string => objectToString.call(value) - -const isPlainObject = (val: unknown): val is object => - toTypeString(val) === '[object Object]' - +let proxy: any const callbacks: Record = {} export function normalizeArg(arg: unknown) { if (typeof arg === 'function') { @@ -55,12 +34,30 @@ function isProxyInvokeCallbackResponse( ): res is ProxyInvokeCallbackResponse { return !!(res as ProxyInvokeCallbackResponse).name } -function moduleGetter( - proxy: any, - module: string, - method: string, - defines: ModuleMethodDefine -) { + +interface ProxyBaseOptions { + pkg: string + cls: string + method: string +} + +interface ProxyFunctionOptions extends ProxyBaseOptions { + async?: boolean +} + +interface InvokeArgs { + package: string + class: string + method: string + params: unknown[] +} + +export function initUtsProxyFunction({ + pkg, + cls, + method, + async, +}: ProxyFunctionOptions) { const invokeCallback = ({ id, name, @@ -74,13 +71,19 @@ function moduleGetter( delete callbacks[id] } } else { - console.error(`${module}.${method} ${name} is not found`) + console.error( + `${pkg}${cls ? '.' + cls : ''}.${method} ${name} is not found` + ) } } + return (...args: unknown[]) => { + if (!proxy) { + proxy = uni.requireNativePlugin('ProxyModule') as any + } const params = args.map((arg) => normalizeArg(arg)) - const invokeArgs = { module, method, params } - if (defines.async) { + const invokeArgs: InvokeArgs = { package: pkg, class: cls, method, params } + if (async) { return new Promise((resolve, reject) => { proxy.invokeAsync(invokeArgs, (res: ProxyInvokeResponse) => { if (isProxyInvokeCallbackResponse(res)) { @@ -99,24 +102,39 @@ function moduleGetter( } } -export function initModule( - name: string, - defines: Record, - proxyModuleName = 'ProxyModule' -) { - let proxy: any - const moduleProxy: Record = {} - for (const method in defines) { - Object.defineProperty(moduleProxy, method, { - enumerable: true, - configurable: true, - get: () => { - if (!proxy) { - proxy = uni.requireNativePlugin(proxyModuleName) - } - return moduleGetter(proxy, name, method, defines[method]) - }, - }) +interface ProxyClassOptions { + pkg: string + cls: string + methods: { + [name: string]: { + async?: boolean + } + } +} + +export function initUtsProxyClass({ + pkg, + cls, + methods, +}: ProxyClassOptions): any { + return class ProxyClass { + constructor() { + const target: Record = {} + return new Proxy(this, { + get(_, method) { + if (!target[method as string]) { + if (hasOwn(methods, method)) { + target[method] = initUtsProxyFunction({ + pkg, + cls, + method, + async: methods[method].async, + }) + } + return target[method as string] + } + }, + }) + } } - return moduleProxy } diff --git a/packages/uni-cli-shared/src/resolve.ts b/packages/uni-cli-shared/src/resolve.ts index f091f238d4ae74581c5313b879159c2182470687..ce84690587bbf6d822fb4e465991c7195c620ad4 100644 --- a/packages/uni-cli-shared/src/resolve.ts +++ b/packages/uni-cli-shared/src/resolve.ts @@ -19,6 +19,22 @@ function resolveWithSymlinks(id: string, basedir: string): string { extensions, // necessary to work with pnpm preserveSymlinks: true, + pathFilter(pkg, filepath, relativePath) { + if (pkg.dcloudext && (pkg.dcloudext as any).type === 'native-uts') { + if ( + process.env.UNI_APP_PLATFORM === 'app-android' || + process.env.UNI_APP_PLATFORM === 'app-ios' + ) { + const file = process.env.UNI_APP_PLATFORM + '/index.uts' + if ( + fs.existsSync(path.join(filepath.replace(relativePath, ''), file)) + ) { + return file + } + } + } + return relativePath + }, }) } diff --git a/packages/uni-stacktracey/dist/uni-stacktracey.cjs.js b/packages/uni-stacktracey/dist/uni-stacktracey.cjs.js index b1a3f3c1c5892e56d4dfd2e78127d328f92d406b..f487f4c25b38486843ac2e6a0f940fd7c01b8326 100644 --- a/packages/uni-stacktracey/dist/uni-stacktracey.cjs.js +++ b/packages/uni-stacktracey/dist/uni-stacktracey.cjs.js @@ -214,16 +214,17 @@ var StackTracey$1 = StackTracey; * http://opensource.org/licenses/BSD-3-Clause */ -const intToCharMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""); +const intToCharMap = + 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split(''); /** * Encode an integer in the range of 0 to 63 to a single base 64 digit. */ -var encode$1 = function(number) { +var encode$1 = function (number) { if (0 <= number && number < intToCharMap.length) { - return intToCharMap[number]; + return intToCharMap[number] } - throw new TypeError("Must be between 0 and 63: " + number); + throw new TypeError('Must be between 0 and 63: ' + number) }; var base64$1 = { @@ -302,16 +303,14 @@ const VLQ_CONTINUATION_BIT = VLQ_BASE; * 2 becomes 4 (100 binary), -2 becomes 5 (101 binary) */ function toVLQSigned(aValue) { - return aValue < 0 - ? ((-aValue) << 1) + 1 - : (aValue << 1) + 0; + return aValue < 0 ? (-aValue << 1) + 1 : (aValue << 1) + 0 } /** * Returns the base 64 VLQ encoded value. */ var encode = function base64VLQ_encode(aValue) { - let encoded = ""; + let encoded = ''; let digit; let vlq = toVLQSigned(aValue); @@ -325,9 +324,9 @@ var encode = function base64VLQ_encode(aValue) { digit |= VLQ_CONTINUATION_BIT; } encoded += base64.encode(digit); - } while (vlq > 0); + } while (vlq > 0) - return encoded; + return encoded }; var base64Vlq = { @@ -360,52 +359,52 @@ var util$1 = createCommonjsModule(function (module, exports) { */ function getArg(aArgs, aName, aDefaultValue) { if (aName in aArgs) { - return aArgs[aName]; + return aArgs[aName] } else if (arguments.length === 3) { - return aDefaultValue; + return aDefaultValue } - throw new Error('"' + aName + '" is a required argument.'); - + throw new Error('"' + aName + '" is a required argument.') } exports.getArg = getArg; -const urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/; +const urlRegexp = + /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/; const dataUrlRegexp = /^data:.+\,.+$/; function urlParse(aUrl) { const match = aUrl.match(urlRegexp); if (!match) { - return null; + return null } return { scheme: match[1], auth: match[2], host: match[3], port: match[4], - path: match[5] - }; + path: match[5], + } } exports.urlParse = urlParse; function urlGenerate(aParsedUrl) { - let url = ""; + let url = ''; if (aParsedUrl.scheme) { - url += aParsedUrl.scheme + ":"; + url += aParsedUrl.scheme + ':'; } - url += "//"; + url += '//'; if (aParsedUrl.auth) { - url += aParsedUrl.auth + "@"; + url += aParsedUrl.auth + '@'; } if (aParsedUrl.host) { url += aParsedUrl.host; } if (aParsedUrl.port) { - url += ":" + aParsedUrl.port; + url += ':' + aParsedUrl.port; } if (aParsedUrl.path) { url += aParsedUrl.path; } - return url; + return url } exports.urlGenerate = urlGenerate; @@ -421,13 +420,13 @@ const MAX_CACHED_INPUTS = 32; function lruMemoize(f) { const cache = []; - return function(input) { + return function (input) { for (let i = 0; i < cache.length; i++) { if (cache[i].input === input) { const temp = cache[0]; cache[0] = cache[i]; cache[i] = temp; - return cache[0].result; + return cache[0].result } } @@ -442,8 +441,8 @@ function lruMemoize(f) { cache.pop(); } - return result; - }; + return result + } } /** @@ -462,7 +461,7 @@ const normalize = lruMemoize(function normalize(aPath) { const url = urlParse(aPath); if (url) { if (!url.path) { - return aPath; + return aPath } path = url.path; } @@ -475,13 +474,13 @@ const normalize = lruMemoize(function normalize(aPath) { let i = 0; while (true) { start = i; - i = path.indexOf("/", start); + i = path.indexOf('/', start); if (i === -1) { parts.push(path.slice(start)); - break; + break } else { parts.push(path.slice(start, i)); - while (i < path.length && path[i] === "/") { + while (i < path.length && path[i] === '/') { i++; } } @@ -490,12 +489,12 @@ const normalize = lruMemoize(function normalize(aPath) { let up = 0; for (i = parts.length - 1; i >= 0; i--) { const part = parts[i]; - if (part === ".") { + if (part === '.') { parts.splice(i, 1); - } else if (part === "..") { + } else if (part === '..') { up++; } else if (up > 0) { - if (part === "") { + if (part === '') { // The first part is blank if the path is absolute. Trying to go // above the root is a no-op. Therefore we can remove all '..' parts // directly after the root. @@ -507,17 +506,17 @@ const normalize = lruMemoize(function normalize(aPath) { } } } - path = parts.join("/"); + path = parts.join('/'); - if (path === "") { - path = isAbsolute ? "/" : "."; + if (path === '') { + path = isAbsolute ? '/' : '.'; } if (url) { url.path = path; - return urlGenerate(url); + return urlGenerate(url) } - return path; + return path }); exports.normalize = normalize; @@ -538,16 +537,16 @@ exports.normalize = normalize; * - Joining for example 'http://' and 'www.example.com' is also supported. */ function join(aRoot, aPath) { - if (aRoot === "") { - aRoot = "."; + if (aRoot === '') { + aRoot = '.'; } - if (aPath === "") { - aPath = "."; + if (aPath === '') { + aPath = '.'; } const aPathUrl = urlParse(aPath); const aRootUrl = urlParse(aRoot); if (aRootUrl) { - aRoot = aRootUrl.path || "/"; + aRoot = aRootUrl.path || '/'; } // `join(foo, '//www.example.org')` @@ -555,33 +554,34 @@ function join(aRoot, aPath) { if (aRootUrl) { aPathUrl.scheme = aRootUrl.scheme; } - return urlGenerate(aPathUrl); + return urlGenerate(aPathUrl) } if (aPathUrl || aPath.match(dataUrlRegexp)) { - return aPath; + return aPath } // `join('http://', 'www.example.com')` if (aRootUrl && !aRootUrl.host && !aRootUrl.path) { aRootUrl.host = aPath; - return urlGenerate(aRootUrl); + return urlGenerate(aRootUrl) } - const joined = aPath.charAt(0) === "/" - ? aPath - : normalize(aRoot.replace(/\/+$/, "") + "/" + aPath); + const joined = + aPath.charAt(0) === '/' + ? aPath + : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath); if (aRootUrl) { aRootUrl.path = joined; - return urlGenerate(aRootUrl); + return urlGenerate(aRootUrl) } - return joined; + return joined } exports.join = join; -exports.isAbsolute = function(aPath) { - return aPath.charAt(0) === "/" || urlRegexp.test(aPath); +exports.isAbsolute = function (aPath) { + return aPath.charAt(0) === '/' || urlRegexp.test(aPath) }; /** @@ -591,21 +591,21 @@ exports.isAbsolute = function(aPath) { * @param aPath The path or URL to be made relative to aRoot. */ function relative(aRoot, aPath) { - if (aRoot === "") { - aRoot = "."; + if (aRoot === '') { + aRoot = '.'; } - aRoot = aRoot.replace(/\/$/, ""); + aRoot = aRoot.replace(/\/$/, ''); // It is possible for the path to be above the root. In this case, simply // checking whether the root is a prefix of the path won't work. Instead, we // need to remove components from the root one by one, until either we find // a prefix that fits, or we run out of components to remove. let level = 0; - while (aPath.indexOf(aRoot + "/") !== 0) { - const index = aRoot.lastIndexOf("/"); + while (aPath.indexOf(aRoot + '/') !== 0) { + const index = aRoot.lastIndexOf('/'); if (index < 0) { - return aPath; + return aPath } // If the only part of the root that is left is the scheme (i.e. http://, @@ -613,24 +613,24 @@ function relative(aRoot, aPath) { // have exhausted all components, so the path is not relative to the root. aRoot = aRoot.slice(0, index); if (aRoot.match(/^([^\/]+:\/)?\/*$/)) { - return aPath; + return aPath } ++level; } // Make sure we add a "../" for each component we removed from the root. - return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1); + return Array(level + 1).join('../') + aPath.substr(aRoot.length + 1) } exports.relative = relative; -const supportsNullProto = (function() { +const supportsNullProto = (function () { const obj = Object.create(null); - return !("__proto__" in obj); -}()); + return !('__proto__' in obj) +})(); function identity(s) { - return s; + return s } /** @@ -644,54 +644,56 @@ function identity(s) { */ function toSetString(aStr) { if (isProtoString(aStr)) { - return "$" + aStr; + return '$' + aStr } - return aStr; + return aStr } exports.toSetString = supportsNullProto ? identity : toSetString; function fromSetString(aStr) { if (isProtoString(aStr)) { - return aStr.slice(1); + return aStr.slice(1) } - return aStr; + return aStr } exports.fromSetString = supportsNullProto ? identity : fromSetString; function isProtoString(s) { if (!s) { - return false; + return false } const length = s.length; if (length < 9 /* "__proto__".length */) { - return false; + return false } /* eslint-disable no-multi-spaces */ - if (s.charCodeAt(length - 1) !== 95 /* '_' */ || - s.charCodeAt(length - 2) !== 95 /* '_' */ || - s.charCodeAt(length - 3) !== 111 /* 'o' */ || - s.charCodeAt(length - 4) !== 116 /* 't' */ || - s.charCodeAt(length - 5) !== 111 /* 'o' */ || - s.charCodeAt(length - 6) !== 114 /* 'r' */ || - s.charCodeAt(length - 7) !== 112 /* 'p' */ || - s.charCodeAt(length - 8) !== 95 /* '_' */ || - s.charCodeAt(length - 9) !== 95 /* '_' */) { - return false; + if ( + s.charCodeAt(length - 1) !== 95 /* '_' */ || + s.charCodeAt(length - 2) !== 95 /* '_' */ || + s.charCodeAt(length - 3) !== 111 /* 'o' */ || + s.charCodeAt(length - 4) !== 116 /* 't' */ || + s.charCodeAt(length - 5) !== 111 /* 'o' */ || + s.charCodeAt(length - 6) !== 114 /* 'r' */ || + s.charCodeAt(length - 7) !== 112 /* 'p' */ || + s.charCodeAt(length - 8) !== 95 /* '_' */ || + s.charCodeAt(length - 9) !== 95 /* '_' */ + ) { + return false } /* eslint-enable no-multi-spaces */ for (let i = length - 10; i >= 0; i--) { if (s.charCodeAt(i) !== 36 /* '$' */) { - return false; + return false } } - return true; + return true } /** @@ -705,30 +707,30 @@ function isProtoString(s) { function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) { let cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0 || onlyCompareOriginal) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } exports.compareByOriginalPositions = compareByOriginalPositions; @@ -741,54 +743,59 @@ exports.compareByOriginalPositions = compareByOriginalPositions; * source/name/original line and column the same. Useful when searching for a * mapping with a stubbed out mapping. */ -function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) { +function compareByGeneratedPositionsDeflated( + mappingA, + mappingB, + onlyCompareGenerated +) { let cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0 || onlyCompareGenerated) { - return cmp; + return cmp } cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } -exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated; +exports.compareByGeneratedPositionsDeflated = + compareByGeneratedPositionsDeflated; function strcmp(aStr1, aStr2) { if (aStr1 === aStr2) { - return 0; + return 0 } if (aStr1 === null) { - return 1; // aStr2 !== null + return 1 // aStr2 !== null } if (aStr2 === null) { - return -1; // aStr1 !== null + return -1 // aStr1 !== null } if (aStr1 > aStr2) { - return 1; + return 1 } - return -1; + return -1 } /** @@ -798,32 +805,33 @@ function strcmp(aStr1, aStr2) { function compareByGeneratedPositionsInflated(mappingA, mappingB) { let cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0) { - return cmp; + return cmp } cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } -exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated; +exports.compareByGeneratedPositionsInflated = + compareByGeneratedPositionsInflated; /** * Strip any JSON XSSI avoidance prefix from the string (as documented @@ -831,7 +839,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate * JSON. */ function parseSourceMapInput(str) { - return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, "")); + return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, '')) } exports.parseSourceMapInput = parseSourceMapInput; @@ -840,12 +848,12 @@ exports.parseSourceMapInput = parseSourceMapInput; * URL, and the source map's URL. */ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { - sourceURL = sourceURL || ""; + sourceURL = sourceURL || ''; if (sourceRoot) { // This follows what Chrome does. - if (sourceRoot[sourceRoot.length - 1] !== "/" && sourceURL[0] !== "/") { - sourceRoot += "/"; + if (sourceRoot[sourceRoot.length - 1] !== '/' && sourceURL[0] !== '/') { + sourceRoot += '/'; } // The spec says: // Line 4: An optional source root, useful for relocating source @@ -872,11 +880,11 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { if (sourceMapURL) { const parsed = urlParse(sourceMapURL); if (!parsed) { - throw new Error("sourceMapURL could not be parsed"); + throw new Error('sourceMapURL could not be parsed') } if (parsed.path) { // Strip the last path component, but keep the "/". - const index = parsed.path.lastIndexOf("/"); + const index = parsed.path.lastIndexOf('/'); if (index >= 0) { parsed.path = parsed.path.substring(0, index + 1); } @@ -884,7 +892,7 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { sourceURL = join(urlGenerate(parsed), sourceURL); } - return normalize(sourceURL); + return normalize(sourceURL) } exports.computeSourceURL = computeSourceURL; }); @@ -916,7 +924,7 @@ class ArraySet$2 { for (let i = 0, len = aArray.length; i < len; i++) { set.add(aArray[i], aAllowDuplicates); } - return set; + return set } /** @@ -926,7 +934,7 @@ class ArraySet$2 { * @returns Number */ size() { - return this._set.size; + return this._set.size } /** @@ -951,7 +959,7 @@ class ArraySet$2 { * @param String aStr */ has(aStr) { - return this._set.has(aStr); + return this._set.has(aStr) } /** @@ -962,9 +970,9 @@ class ArraySet$2 { indexOf(aStr) { const idx = this._set.get(aStr); if (idx >= 0) { - return idx; + return idx } - throw new Error('"' + aStr + '" is not in the set.'); + throw new Error('"' + aStr + '" is not in the set.') } /** @@ -974,9 +982,9 @@ class ArraySet$2 { */ at(aIdx) { if (aIdx >= 0 && aIdx < this._array.length) { - return this._array[aIdx]; + return this._array[aIdx] } - throw new Error("No element indexed by " + aIdx); + throw new Error('No element indexed by ' + aIdx) } /** @@ -985,7 +993,7 @@ class ArraySet$2 { * for storing the members so that no one can mess with internal state. */ toArray() { - return this._array.slice(); + return this._array.slice() } } var ArraySet_1 = ArraySet$2; @@ -1016,8 +1024,11 @@ function generatedPositionAfter(mappingA, mappingB) { const lineB = mappingB.generatedLine; const columnA = mappingA.generatedColumn; const columnB = mappingB.generatedColumn; - return lineB > lineA || lineB == lineA && columnB >= columnA || - util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0; + return ( + lineB > lineA || + (lineB == lineA && columnB >= columnA) || + util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0 + ) } /** @@ -1030,7 +1041,7 @@ class MappingList$1 { this._array = []; this._sorted = true; // Serves as infimum - this._last = {generatedLine: -1, generatedColumn: 0}; + this._last = { generatedLine: -1, generatedColumn: 0 }; } /** @@ -1072,7 +1083,7 @@ class MappingList$1 { this._array.sort(util.compareByGeneratedPositionsInflated); this._sorted = true; } - return this._array; + return this._array } } @@ -1114,9 +1125,9 @@ class SourceMapGenerator$1 { if (!aArgs) { aArgs = {}; } - this._file = util.getArg(aArgs, "file", null); - this._sourceRoot = util.getArg(aArgs, "sourceRoot", null); - this._skipValidation = util.getArg(aArgs, "skipValidation", false); + this._file = util.getArg(aArgs, 'file', null); + this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null); + this._skipValidation = util.getArg(aArgs, 'skipValidation', false); this._sources = new ArraySet$1(); this._names = new ArraySet$1(); this._mappings = new MappingList(); @@ -1132,14 +1143,14 @@ class SourceMapGenerator$1 { const sourceRoot = aSourceMapConsumer.sourceRoot; const generator = new SourceMapGenerator$1({ file: aSourceMapConsumer.file, - sourceRoot + sourceRoot, }); - aSourceMapConsumer.eachMapping(function(mapping) { + aSourceMapConsumer.eachMapping(function (mapping) { const newMapping = { generated: { line: mapping.generatedLine, - column: mapping.generatedColumn - } + column: mapping.generatedColumn, + }, }; if (mapping.source != null) { @@ -1150,7 +1161,7 @@ class SourceMapGenerator$1 { newMapping.original = { line: mapping.originalLine, - column: mapping.originalColumn + column: mapping.originalColumn, }; if (mapping.name != null) { @@ -1160,7 +1171,7 @@ class SourceMapGenerator$1 { generator.addMapping(newMapping); }); - aSourceMapConsumer.sources.forEach(function(sourceFile) { + aSourceMapConsumer.sources.forEach(function (sourceFile) { let sourceRelative = sourceFile; if (sourceRoot !== null) { sourceRelative = util.relative(sourceRoot, sourceFile); @@ -1175,7 +1186,7 @@ class SourceMapGenerator$1 { generator.setSourceContent(sourceFile, content); } }); - return generator; + return generator } /** @@ -1189,10 +1200,10 @@ class SourceMapGenerator$1 { * - name: An optional original token name for this mapping. */ addMapping(aArgs) { - const generated = util.getArg(aArgs, "generated"); - const original = util.getArg(aArgs, "original", null); - let source = util.getArg(aArgs, "source", null); - let name = util.getArg(aArgs, "name", null); + const generated = util.getArg(aArgs, 'generated'); + const original = util.getArg(aArgs, 'original', null); + let source = util.getArg(aArgs, 'source', null); + let name = util.getArg(aArgs, 'name', null); if (!this._skipValidation) { this._validateMapping(generated, original, source, name); @@ -1218,7 +1229,7 @@ class SourceMapGenerator$1 { originalLine: original != null && original.line, originalColumn: original != null && original.column, source, - name + name, }); } @@ -1270,9 +1281,9 @@ class SourceMapGenerator$1 { if (aSourceFile == null) { if (aSourceMapConsumer.file == null) { throw new Error( - "SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, " + - 'or the source map\'s "file" property. Both were omitted.' - ); + 'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' + + 'or the source map\'s "file" property. Both were omitted.' + ) } sourceFile = aSourceMapConsumer.file; } @@ -1283,18 +1294,17 @@ class SourceMapGenerator$1 { } // Applying the SourceMap can add and remove items from the sources and // the names array. - const newSources = this._mappings.toArray().length > 0 - ? new ArraySet$1() - : this._sources; + const newSources = + this._mappings.toArray().length > 0 ? new ArraySet$1() : this._sources; const newNames = new ArraySet$1(); // Find mappings for the "sourceFile" - this._mappings.unsortedForEach(function(mapping) { + this._mappings.unsortedForEach(function (mapping) { if (mapping.source === sourceFile && mapping.originalLine != null) { // Check if it can be mapped by the source map, then update the mapping. const original = aSourceMapConsumer.originalPositionFor({ line: mapping.originalLine, - column: mapping.originalColumn + column: mapping.originalColumn, }); if (original.source != null) { // Copy mapping @@ -1322,13 +1332,12 @@ class SourceMapGenerator$1 { if (name != null && !newNames.has(name)) { newNames.add(name); } - }, this); this._sources = newSources; this._names = newNames; // Copy sourcesContents of applied map. - aSourceMapConsumer.sources.forEach(function(srcFile) { + aSourceMapConsumer.sources.forEach(function (srcFile) { const content = aSourceMapConsumer.sourceContentFor(srcFile); if (content != null) { if (aSourceMapPath != null) { @@ -1358,27 +1367,49 @@ class SourceMapGenerator$1 { // it is most likely a programmer error. In this case we throw a very // specific error message to try to guide them the right way. // For example: https://github.com/Polymer/polymer-bundler/pull/519 - if (aOriginal && typeof aOriginal.line !== "number" && typeof aOriginal.column !== "number") { - throw new Error( - "original.line and original.column are not numbers -- you probably meant to omit " + - "the original mapping entirely and only map the generated position. If so, pass " + - "null for the original mapping instead of an object with empty or null values." - ); - } - - if (aGenerated && "line" in aGenerated && "column" in aGenerated - && aGenerated.line > 0 && aGenerated.column >= 0 - && !aOriginal && !aSource && !aName) ; else if (aGenerated && "line" in aGenerated && "column" in aGenerated - && aOriginal && "line" in aOriginal && "column" in aOriginal - && aGenerated.line > 0 && aGenerated.column >= 0 - && aOriginal.line > 0 && aOriginal.column >= 0 - && aSource) ; else { - throw new Error("Invalid mapping: " + JSON.stringify({ - generated: aGenerated, - source: aSource, - original: aOriginal, - name: aName - })); + if ( + aOriginal && + typeof aOriginal.line !== 'number' && + typeof aOriginal.column !== 'number' + ) { + throw new Error( + 'original.line and original.column are not numbers -- you probably meant to omit ' + + 'the original mapping entirely and only map the generated position. If so, pass ' + + 'null for the original mapping instead of an object with empty or null values.' + ) + } + + if ( + aGenerated && + 'line' in aGenerated && + 'column' in aGenerated && + aGenerated.line > 0 && + aGenerated.column >= 0 && + !aOriginal && + !aSource && + !aName + ) ; else if ( + aGenerated && + 'line' in aGenerated && + 'column' in aGenerated && + aOriginal && + 'line' in aOriginal && + 'column' in aOriginal && + aGenerated.line > 0 && + aGenerated.column >= 0 && + aOriginal.line > 0 && + aOriginal.column >= 0 && + aSource + ) ; else { + throw new Error( + 'Invalid mapping: ' + + JSON.stringify({ + generated: aGenerated, + source: aSource, + original: aOriginal, + name: aName, + }) + ) } } @@ -1393,7 +1424,7 @@ class SourceMapGenerator$1 { let previousOriginalLine = 0; let previousName = 0; let previousSource = 0; - let result = ""; + let result = ''; let next; let mapping; let nameIdx; @@ -1402,23 +1433,26 @@ class SourceMapGenerator$1 { const mappings = this._mappings.toArray(); for (let i = 0, len = mappings.length; i < len; i++) { mapping = mappings[i]; - next = ""; + next = ''; if (mapping.generatedLine !== previousGeneratedLine) { previousGeneratedColumn = 0; while (mapping.generatedLine !== previousGeneratedLine) { - next += ";"; + next += ';'; previousGeneratedLine++; } } else if (i > 0) { - if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) { - continue; + if ( + !util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1]) + ) { + continue } - next += ","; + next += ','; } - next += base64VLQ.encode(mapping.generatedColumn - - previousGeneratedColumn); + next += base64VLQ.encode( + mapping.generatedColumn - previousGeneratedColumn + ); previousGeneratedColumn = mapping.generatedColumn; if (mapping.source != null) { @@ -1427,12 +1461,14 @@ class SourceMapGenerator$1 { previousSource = sourceIdx; // lines are stored 0-based in SourceMap spec version 3 - next += base64VLQ.encode(mapping.originalLine - 1 - - previousOriginalLine); + next += base64VLQ.encode( + mapping.originalLine - 1 - previousOriginalLine + ); previousOriginalLine = mapping.originalLine - 1; - next += base64VLQ.encode(mapping.originalColumn - - previousOriginalColumn); + next += base64VLQ.encode( + mapping.originalColumn - previousOriginalColumn + ); previousOriginalColumn = mapping.originalColumn; if (mapping.name != null) { @@ -1445,13 +1481,13 @@ class SourceMapGenerator$1 { result += next; } - return result; + return result } _generateSourcesContent(aSources, aSourceRoot) { - return aSources.map(function(source) { + return aSources.map(function (source) { if (!this._sourcesContents) { - return null; + return null } if (aSourceRoot != null) { source = util.relative(aSourceRoot, source); @@ -1459,8 +1495,8 @@ class SourceMapGenerator$1 { const key = util.toSetString(source); return Object.prototype.hasOwnProperty.call(this._sourcesContents, key) ? this._sourcesContents[key] - : null; - }, this); + : null + }, this) } /** @@ -1471,7 +1507,7 @@ class SourceMapGenerator$1 { version: this._version, sources: this._sources.toArray(), names: this._names.toArray(), - mappings: this._serializeMappings() + mappings: this._serializeMappings(), }; if (this._file != null) { map.file = this._file; @@ -1480,17 +1516,20 @@ class SourceMapGenerator$1 { map.sourceRoot = this._sourceRoot; } if (this._sourcesContents) { - map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot); + map.sourcesContent = this._generateSourcesContent( + map.sources, + map.sourceRoot + ); } - return map; + return map } /** * Render the source map being generated to a string. */ toString() { - return JSON.stringify(this.toJSON()); + return JSON.stringify(this.toJSON()) } } @@ -1540,33 +1579,33 @@ function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) { const cmp = aCompare(aNeedle, aHaystack[mid], true); if (cmp === 0) { // Found the element we are looking for. - return mid; + return mid } else if (cmp > 0) { // Our needle is greater than aHaystack[mid]. if (aHigh - mid > 1) { // The element is in the upper half. - return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias); + return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias) } // The exact needle element was not found in this haystack. Determine if // we are in termination case (3) or (2) and return the appropriate thing. if (aBias == exports.LEAST_UPPER_BOUND) { - return aHigh < aHaystack.length ? aHigh : -1; + return aHigh < aHaystack.length ? aHigh : -1 } - return mid; + return mid } // Our needle is less than aHaystack[mid]. if (mid - aLow > 1) { // The element is in the lower half. - return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias); + return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias) } // we are in termination case (3) or (2) and return the appropriate thing. if (aBias == exports.LEAST_UPPER_BOUND) { - return mid; + return mid } - return aLow < 0 ? -1 : aLow; + return aLow < 0 ? -1 : aLow } /** @@ -1589,13 +1628,19 @@ function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) { */ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { if (aHaystack.length === 0) { - return -1; + return -1 } - let index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack, - aCompare, aBias || exports.GREATEST_LOWER_BOUND); + let index = recursiveSearch( + -1, + aHaystack.length, + aNeedle, + aHaystack, + aCompare, + aBias || exports.GREATEST_LOWER_BOUND + ); if (index < 0) { - return -1; + return -1 } // We have found either the exact element, or the next-closest element than @@ -1603,12 +1648,12 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { // element. Make sure we always return the smallest of these. while (index - 1 >= 0) { if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) { - break; + break } --index; } - return index; + return index }; }); @@ -1622,20 +1667,26 @@ var readWasm$1 = createCommonjsModule(function (module) { module.exports = function readWasm() { return new Promise((resolve, reject) => { - const wasmPath = path.join(__dirname, "../lib/source-map/lib", "mappings.wasm"); + const wasmPath = path.join( + __dirname, + '../lib/source-map/lib', + 'mappings.wasm' + ); fs.readFile(wasmPath, null, (error, data) => { if (error) { reject(error); - return; + return } resolve(data.buffer); }); - }); + }) }; - module.exports.initialize = _ => { - console.debug("SourceMapConsumer.initialize is a no-op when running in node.js"); + module.exports.initialize = (_) => { + console.debug( + 'SourceMapConsumer.initialize is a no-op when running in node.js' + ); }; } }); @@ -1659,12 +1710,13 @@ let cachedWasm = null; var wasm$1 = function wasm() { if (cachedWasm) { - return cachedWasm; + return cachedWasm } const callbackStack = []; - cachedWasm = readWasm().then(buffer => { + cachedWasm = readWasm() + .then((buffer) => { return WebAssembly.instantiate(buffer, { env: { mapping_callback( @@ -1706,46 +1758,76 @@ var wasm$1 = function wasm() { callbackStack[callbackStack.length - 1](mapping); }, - start_all_generated_locations_for() { console.time("all_generated_locations_for"); }, - end_all_generated_locations_for() { console.timeEnd("all_generated_locations_for"); }, + start_all_generated_locations_for() { + console.time('all_generated_locations_for'); + }, + end_all_generated_locations_for() { + console.timeEnd('all_generated_locations_for'); + }, - start_compute_column_spans() { console.time("compute_column_spans"); }, - end_compute_column_spans() { console.timeEnd("compute_column_spans"); }, + start_compute_column_spans() { + console.time('compute_column_spans'); + }, + end_compute_column_spans() { + console.timeEnd('compute_column_spans'); + }, - start_generated_location_for() { console.time("generated_location_for"); }, - end_generated_location_for() { console.timeEnd("generated_location_for"); }, + start_generated_location_for() { + console.time('generated_location_for'); + }, + end_generated_location_for() { + console.timeEnd('generated_location_for'); + }, - start_original_location_for() { console.time("original_location_for"); }, - end_original_location_for() { console.timeEnd("original_location_for"); }, + start_original_location_for() { + console.time('original_location_for'); + }, + end_original_location_for() { + console.timeEnd('original_location_for'); + }, - start_parse_mappings() { console.time("parse_mappings"); }, - end_parse_mappings() { console.timeEnd("parse_mappings"); }, + start_parse_mappings() { + console.time('parse_mappings'); + }, + end_parse_mappings() { + console.timeEnd('parse_mappings'); + }, - start_sort_by_generated_location() { console.time("sort_by_generated_location"); }, - end_sort_by_generated_location() { console.timeEnd("sort_by_generated_location"); }, + start_sort_by_generated_location() { + console.time('sort_by_generated_location'); + }, + end_sort_by_generated_location() { + console.timeEnd('sort_by_generated_location'); + }, - start_sort_by_original_location() { console.time("sort_by_original_location"); }, - end_sort_by_original_location() { console.timeEnd("sort_by_original_location"); }, - } - }); - }).then(Wasm => { - return { - exports: Wasm.instance.exports, - withMappingCallback: (mappingCallback, f) => { - callbackStack.push(mappingCallback); - try { - f(); - } finally { - callbackStack.pop(); - } + start_sort_by_original_location() { + console.time('sort_by_original_location'); + }, + end_sort_by_original_location() { + console.timeEnd('sort_by_original_location'); + }, + }, + }) + }) + .then((Wasm) => { + return { + exports: Wasm.instance.exports, + withMappingCallback: (mappingCallback, f) => { + callbackStack.push(mappingCallback); + try { + f(); + } finally { + callbackStack.pop(); + } + }, } - }; - }).then(null, e => { - cachedWasm = null; - throw e; - }); + }) + .then(null, (e) => { + cachedWasm = null; + throw e + }); - return cachedWasm; + return cachedWasm }; var binarySearch = binarySearch$1; @@ -1767,7 +1849,7 @@ const ArraySet = require$$0$1.ArraySet; -const INTERNAL = Symbol("smcInternal"); +const INTERNAL = Symbol('smcInternal'); class SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { @@ -1775,18 +1857,18 @@ class SourceMapConsumer$1 { // Yes, this is a hack to retain the pre-existing API of the base-class // constructor also being an async factory function. if (aSourceMap == INTERNAL) { - return Promise.resolve(this); + return Promise.resolve(this) } - return _factory(aSourceMap, aSourceMapURL); + return _factory(aSourceMap, aSourceMapURL) } static initialize(opts) { - readWasm.initialize(opts["lib/mappings.wasm"]); + readWasm.initialize(opts['lib/mappings.wasm']); } static fromSourceMap(aSourceMap, aSourceMapURL) { - return _factoryBSM(aSourceMap, aSourceMapURL); + return _factoryBSM(aSourceMap, aSourceMapURL) } /** @@ -1822,7 +1904,7 @@ class SourceMapConsumer$1 { static async with(rawSourceMap, sourceMapUrl, f) { const consumer = await new SourceMapConsumer$1(rawSourceMap, sourceMapUrl); try { - return await f(consumer); + return await f(consumer) } finally { consumer.destroy(); } @@ -1834,7 +1916,7 @@ class SourceMapConsumer$1 { * `this.__originalMappings` properties). */ _parseMappings(aStr, aSourceRoot) { - throw new Error("Subclasses must implement _parseMappings"); + throw new Error('Subclasses must implement _parseMappings') } /** @@ -1854,7 +1936,7 @@ class SourceMapConsumer$1 { * `SourceMapConsumer.GENERATED_ORDER`. */ eachMapping(aCallback, aContext, aOrder) { - throw new Error("Subclasses must implement eachMapping"); + throw new Error('Subclasses must implement eachMapping') } /** @@ -1880,11 +1962,11 @@ class SourceMapConsumer$1 { * The column number is 0-based. */ allGeneratedPositionsFor(aArgs) { - throw new Error("Subclasses must implement allGeneratedPositionsFor"); + throw new Error('Subclasses must implement allGeneratedPositionsFor') } destroy() { - throw new Error("Subclasses must implement destroy"); + throw new Error('Subclasses must implement destroy') } } @@ -1936,26 +2018,26 @@ var SourceMapConsumer_1 = SourceMapConsumer$1; */ class BasicSourceMapConsumer extends SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { - return super(INTERNAL).then(that => { + return super(INTERNAL).then((that) => { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const version = util.getArg(sourceMap, "version"); - let sources = util.getArg(sourceMap, "sources"); + const version = util.getArg(sourceMap, 'version'); + let sources = util.getArg(sourceMap, 'sources'); // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which // requires the array) to play nice here. - const names = util.getArg(sourceMap, "names", []); - let sourceRoot = util.getArg(sourceMap, "sourceRoot", null); - const sourcesContent = util.getArg(sourceMap, "sourcesContent", null); - const mappings = util.getArg(sourceMap, "mappings"); - const file = util.getArg(sourceMap, "file", null); + const names = util.getArg(sourceMap, 'names', []); + let sourceRoot = util.getArg(sourceMap, 'sourceRoot', null); + const sourcesContent = util.getArg(sourceMap, 'sourcesContent', null); + const mappings = util.getArg(sourceMap, 'mappings'); + const file = util.getArg(sourceMap, 'file', null); // Once again, Sass deviates from the spec and supplies the version as a // string rather than a number, so we use loose equality checking here. if (version != that._version) { - throw new Error("Unsupported version: " + version); + throw new Error('Unsupported version: ' + version) } if (sourceRoot) { @@ -1972,10 +2054,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // the source root, if the source root is absolute. Not doing this would // be particularly problematic when the source root is a prefix of the // source (valid, but why??). See github issue #199 and bugzil.la/1188982. - .map(function(source) { - return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source) + .map(function (source) { + return sourceRoot && + util.isAbsolute(sourceRoot) && + util.isAbsolute(source) ? util.relative(sourceRoot, source) - : source; + : source }); // Pass `true` below to allow duplicate names and sources. While source maps @@ -1985,8 +2069,8 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { that._names = ArraySet.fromArray(names.map(String), true); that._sources = ArraySet.fromArray(sources, true); - that._absoluteSources = that._sources.toArray().map(function(s) { - return util.computeSourceURL(sourceRoot, s, aSourceMapURL); + that._absoluteSources = that._sources.toArray().map(function (s) { + return util.computeSourceURL(sourceRoot, s, aSourceMapURL) }); that.sourceRoot = sourceRoot; @@ -1999,11 +2083,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { that._mappingsPtr = 0; that._wasm = null; - return wasm().then(w => { + return wasm().then((w) => { that._wasm = w; - return that; - }); - }); + return that + }) + }) } /** @@ -2017,18 +2101,18 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { } if (this._sources.has(relativeSource)) { - return this._sources.indexOf(relativeSource); + return this._sources.indexOf(relativeSource) } // Maybe aSource is an absolute URL as returned by |sources|. In // this case we can't simply undo the transform. for (let i = 0; i < this._absoluteSources.length; ++i) { if (this._absoluteSources[i] == aSource) { - return i; + return i } } - return -1; + return -1 } /** @@ -2041,11 +2125,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { * @returns BasicSourceMapConsumer */ static fromSourceMap(aSourceMap, aSourceMapURL) { - return new BasicSourceMapConsumer(aSourceMap.toString()); + return new BasicSourceMapConsumer(aSourceMap.toString()) } get sources() { - return this._absoluteSources.slice(); + return this._absoluteSources.slice() } _getMappingsPtr() { @@ -2053,7 +2137,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this._mappingsPtr; + return this._mappingsPtr } /** @@ -2065,7 +2149,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { const size = aStr.length; const mappingsBufPtr = this._wasm.exports.allocate_mappings(size); - const mappingsBuf = new Uint8Array(this._wasm.exports.memory.buffer, mappingsBufPtr, size); + const mappingsBuf = new Uint8Array( + this._wasm.exports.memory.buffer, + mappingsBufPtr, + size + ); for (let i = 0; i < size; i++) { mappingsBuf[i] = aStr.charCodeAt(i); } @@ -2079,23 +2167,24 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // XXX: keep these error codes in sync with `fitzgen/source-map-mappings`. switch (error) { case 1: - msg += "the mappings contained a negative line, column, source index, or name index"; - break; + msg += + 'the mappings contained a negative line, column, source index, or name index'; + break case 2: - msg += "the mappings contained a number larger than 2**32"; - break; + msg += 'the mappings contained a number larger than 2**32'; + break case 3: - msg += "reached EOF while in the middle of parsing a VLQ"; - break; + msg += 'reached EOF while in the middle of parsing a VLQ'; + break case 4: - msg += "invalid base 64 character while parsing a VLQ"; - break; + msg += 'invalid base 64 character while parsing a VLQ'; + break default: - msg += "unknown error code"; - break; + msg += 'unknown error code'; + break } - throw new Error(msg); + throw new Error(msg) } this._mappingsPtr = mappingsPtr; @@ -2107,10 +2196,14 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { const sourceRoot = this.sourceRoot; this._wasm.withMappingCallback( - mapping => { + (mapping) => { if (mapping.source !== null) { mapping.source = this._sources.at(mapping.source); - mapping.source = util.computeSourceURL(sourceRoot, mapping.source, this._sourceMapURL); + mapping.source = util.computeSourceURL( + sourceRoot, + mapping.source, + this._sourceMapURL + ); if (mapping.name !== null) { mapping.name = this._names.at(mapping.name); @@ -2121,41 +2214,41 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { }, () => { switch (order) { - case SourceMapConsumer$1.GENERATED_ORDER: - this._wasm.exports.by_generated_location(this._getMappingsPtr()); - break; - case SourceMapConsumer$1.ORIGINAL_ORDER: - this._wasm.exports.by_original_location(this._getMappingsPtr()); - break; - default: - throw new Error("Unknown order of iteration."); + case SourceMapConsumer$1.GENERATED_ORDER: + this._wasm.exports.by_generated_location(this._getMappingsPtr()); + break + case SourceMapConsumer$1.ORIGINAL_ORDER: + this._wasm.exports.by_original_location(this._getMappingsPtr()); + break + default: + throw new Error('Unknown order of iteration.') } } ); } allGeneratedPositionsFor(aArgs) { - let source = util.getArg(aArgs, "source"); - const originalLine = util.getArg(aArgs, "line"); + let source = util.getArg(aArgs, 'source'); + const originalLine = util.getArg(aArgs, 'line'); const originalColumn = aArgs.column || 0; source = this._findSourceIndex(source); if (source < 0) { - return []; + return [] } if (originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } const mappings = []; this._wasm.withMappingCallback( - m => { + (m) => { let lastColumn = m.lastGeneratedColumn; if (this._computedColumnSpans && lastColumn === null) { lastColumn = Infinity; @@ -2165,18 +2258,19 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { column: m.generatedColumn, lastColumn, }); - }, () => { + }, + () => { this._wasm.exports.all_generated_locations_for( this._getMappingsPtr(), source, originalLine - 1, - "column" in aArgs, + 'column' in aArgs, originalColumn ); } ); - return mappings; + return mappings } destroy() { @@ -2192,7 +2286,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ computeColumnSpans() { if (this._computedColumnSpans) { - return; + return } this._wasm.exports.compute_column_spans(this._getMappingsPtr()); @@ -2225,52 +2319,63 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ originalPositionFor(aArgs) { const needle = { - generatedLine: util.getArg(aArgs, "line"), - generatedColumn: util.getArg(aArgs, "column") + generatedLine: util.getArg(aArgs, 'line'), + generatedColumn: util.getArg(aArgs, 'column'), }; if (needle.generatedLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.generatedColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } - let bias = util.getArg(aArgs, "bias", SourceMapConsumer$1.GREATEST_LOWER_BOUND); + let bias = util.getArg( + aArgs, + 'bias', + SourceMapConsumer$1.GREATEST_LOWER_BOUND + ); if (bias == null) { bias = SourceMapConsumer$1.GREATEST_LOWER_BOUND; } let mapping; - this._wasm.withMappingCallback(m => mapping = m, () => { - this._wasm.exports.original_location_for( - this._getMappingsPtr(), - needle.generatedLine - 1, - needle.generatedColumn, - bias - ); - }); + this._wasm.withMappingCallback( + (m) => (mapping = m), + () => { + this._wasm.exports.original_location_for( + this._getMappingsPtr(), + needle.generatedLine - 1, + needle.generatedColumn, + bias + ); + } + ); if (mapping) { if (mapping.generatedLine === needle.generatedLine) { - let source = util.getArg(mapping, "source", null); + let source = util.getArg(mapping, 'source', null); if (source !== null) { source = this._sources.at(source); - source = util.computeSourceURL(this.sourceRoot, source, this._sourceMapURL); + source = util.computeSourceURL( + this.sourceRoot, + source, + this._sourceMapURL + ); } - let name = util.getArg(mapping, "name", null); + let name = util.getArg(mapping, 'name', null); if (name !== null) { name = this._names.at(name); } return { source, - line: util.getArg(mapping, "originalLine", null), - column: util.getArg(mapping, "originalColumn", null), - name - }; + line: util.getArg(mapping, 'originalLine', null), + column: util.getArg(mapping, 'originalColumn', null), + name, + } } } @@ -2278,8 +2383,8 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { source: null, line: null, column: null, - name: null - }; + name: null, + } } /** @@ -2288,10 +2393,14 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ hasContentsOfAllSources() { if (!this.sourcesContent) { - return false; + return false } - return this.sourcesContent.length >= this._sources.size() && - !this.sourcesContent.some(function(sc) { return sc == null; }); + return ( + this.sourcesContent.length >= this._sources.size() && + !this.sourcesContent.some(function (sc) { + return sc == null + }) + ) } /** @@ -2301,12 +2410,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ sourceContentFor(aSource, nullOnMissing) { if (!this.sourcesContent) { - return null; + return null } const index = this._findSourceIndex(aSource); if (index >= 0) { - return this.sourcesContent[index]; + return this.sourcesContent[index] } let relativeSource = aSource; @@ -2315,21 +2424,21 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { } let url; - if (this.sourceRoot != null - && (url = util.urlParse(this.sourceRoot))) { + if (this.sourceRoot != null && (url = util.urlParse(this.sourceRoot))) { // XXX: file:// URIs and absolute paths lead to unexpected behavior for // many users. We can help them out when they expect file:// URIs to // behave like it would if they were running a local HTTP server. See // https://bugzilla.mozilla.org/show_bug.cgi?id=885597. - const fileUriAbsPath = relativeSource.replace(/^file:\/\//, ""); - if (url.scheme == "file" - && this._sources.has(fileUriAbsPath)) { - return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]; + const fileUriAbsPath = relativeSource.replace(/^file:\/\//, ''); + if (url.scheme == 'file' && this._sources.has(fileUriAbsPath)) { + return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)] } - if ((!url.path || url.path == "/") - && this._sources.has("/" + relativeSource)) { - return this.sourcesContent[this._sources.indexOf("/" + relativeSource)]; + if ( + (!url.path || url.path == '/') && + this._sources.has('/' + relativeSource) + ) { + return this.sourcesContent[this._sources.indexOf('/' + relativeSource)] } } @@ -2338,10 +2447,10 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // don't want to throw if we can't find the source - we just want to // return null, so we provide a flag to exit gracefully. if (nullOnMissing) { - return null; + return null } - throw new Error('"' + relativeSource + '" is not in the SourceMap.'); + throw new Error('"' + relativeSource + '" is not in the SourceMap.') } /** @@ -2368,45 +2477,52 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { * The column number is 0-based. */ generatedPositionFor(aArgs) { - let source = util.getArg(aArgs, "source"); + let source = util.getArg(aArgs, 'source'); source = this._findSourceIndex(source); if (source < 0) { return { line: null, column: null, - lastColumn: null - }; + lastColumn: null, + } } const needle = { source, - originalLine: util.getArg(aArgs, "line"), - originalColumn: util.getArg(aArgs, "column") + originalLine: util.getArg(aArgs, 'line'), + originalColumn: util.getArg(aArgs, 'column'), }; if (needle.originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } - let bias = util.getArg(aArgs, "bias", SourceMapConsumer$1.GREATEST_LOWER_BOUND); + let bias = util.getArg( + aArgs, + 'bias', + SourceMapConsumer$1.GREATEST_LOWER_BOUND + ); if (bias == null) { bias = SourceMapConsumer$1.GREATEST_LOWER_BOUND; } let mapping; - this._wasm.withMappingCallback(m => mapping = m, () => { - this._wasm.exports.generated_location_for( - this._getMappingsPtr(), - needle.source, - needle.originalLine - 1, - needle.originalColumn, - bias - ); - }); + this._wasm.withMappingCallback( + (m) => (mapping = m), + () => { + this._wasm.exports.generated_location_for( + this._getMappingsPtr(), + needle.source, + needle.originalLine - 1, + needle.originalColumn, + bias + ); + } + ); if (mapping) { if (mapping.source === needle.source) { @@ -2415,18 +2531,18 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { lastColumn = Infinity; } return { - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, - }; + } } } return { line: null, column: null, - lastColumn: null - }; + lastColumn: null, + } } } @@ -2484,17 +2600,17 @@ var BasicSourceMapConsumer_1 = BasicSourceMapConsumer; */ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { - return super(INTERNAL).then(that => { + return super(INTERNAL).then((that) => { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const version = util.getArg(sourceMap, "version"); - const sections = util.getArg(sourceMap, "sections"); + const version = util.getArg(sourceMap, 'version'); + const sections = util.getArg(sourceMap, 'sections'); if (version != that._version) { - throw new Error("Unsupported version: " + version); + throw new Error('Unsupported version: ' + version) } that._sources = new ArraySet(); @@ -2506,41 +2622,52 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { let lastOffset = { line: -1, - column: 0 + column: 0, }; - return Promise.all(sections.map(s => { - if (s.url) { - // The url field will require support for asynchronicity. - // See https://github.com/mozilla/source-map/issues/16 - throw new Error("Support for url field in sections not implemented."); - } - const offset = util.getArg(s, "offset"); - const offsetLine = util.getArg(offset, "line"); - const offsetColumn = util.getArg(offset, "column"); + return Promise.all( + sections.map((s) => { + if (s.url) { + // The url field will require support for asynchronicity. + // See https://github.com/mozilla/source-map/issues/16 + throw new Error( + 'Support for url field in sections not implemented.' + ) + } + const offset = util.getArg(s, 'offset'); + const offsetLine = util.getArg(offset, 'line'); + const offsetColumn = util.getArg(offset, 'column'); - if (offsetLine < lastOffset.line || - (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) { - throw new Error("Section offsets must be ordered and non-overlapping."); - } - lastOffset = offset; - - const cons = new SourceMapConsumer$1(util.getArg(s, "map"), aSourceMapURL); - return cons.then(consumer => { - return { - generatedOffset: { - // The offset fields are 0-based, but we use 1-based indices when - // encoding/decoding from VLQ. - generatedLine: offsetLine + 1, - generatedColumn: offsetColumn + 1 - }, - consumer - }; - }); - })).then(s => { + if ( + offsetLine < lastOffset.line || + (offsetLine === lastOffset.line && offsetColumn < lastOffset.column) + ) { + throw new Error( + 'Section offsets must be ordered and non-overlapping.' + ) + } + lastOffset = offset; + + const cons = new SourceMapConsumer$1( + util.getArg(s, 'map'), + aSourceMapURL + ); + return cons.then((consumer) => { + return { + generatedOffset: { + // The offset fields are 0-based, but we use 1-based indices when + // encoding/decoding from VLQ. + generatedLine: offsetLine + 1, + generatedColumn: offsetColumn + 1, + }, + consumer, + } + }) + }) + ).then((s) => { that._sections = s; - return that; - }); - }); + return that + }) + }) } // `__generatedMappings` and `__originalMappings` are arrays that hold the @@ -2577,7 +2704,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._sortGeneratedMappings(); } - return this.__generatedMappings; + return this.__generatedMappings } get _originalMappings() { @@ -2585,7 +2712,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._sortOriginalMappings(); } - return this.__originalMappings; + return this.__originalMappings } get _generatedMappingsUnsorted() { @@ -2593,7 +2720,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this.__generatedMappingsUnsorted; + return this.__generatedMappingsUnsorted } get _originalMappingsUnsorted() { @@ -2601,7 +2728,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this.__originalMappingsUnsorted; + return this.__originalMappingsUnsorted } _sortGeneratedMappings() { @@ -2626,7 +2753,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { sources.push(this._sections[i].consumer.sources[j]); } } - return sources; + return sources } /** @@ -2650,22 +2777,25 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { */ originalPositionFor(aArgs) { const needle = { - generatedLine: util.getArg(aArgs, "line"), - generatedColumn: util.getArg(aArgs, "column") + generatedLine: util.getArg(aArgs, 'line'), + generatedColumn: util.getArg(aArgs, 'column'), }; // Find the section containing the generated position we're trying to map // to an original position. - const sectionIndex = binarySearch.search(needle, this._sections, - function(aNeedle, section) { - const cmp = aNeedle.generatedLine - section.generatedOffset.generatedLine; + const sectionIndex = binarySearch.search( + needle, + this._sections, + function (aNeedle, section) { + const cmp = + aNeedle.generatedLine - section.generatedOffset.generatedLine; if (cmp) { - return cmp; + return cmp } - return (aNeedle.generatedColumn - - section.generatedOffset.generatedColumn); - }); + return aNeedle.generatedColumn - section.generatedOffset.generatedColumn + } + ); const section = this._sections[sectionIndex]; if (!section) { @@ -2673,19 +2803,19 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { source: null, line: null, column: null, - name: null - }; + name: null, + } } return section.consumer.originalPositionFor({ - line: needle.generatedLine - - (section.generatedOffset.generatedLine - 1), - column: needle.generatedColumn - + line: needle.generatedLine - (section.generatedOffset.generatedLine - 1), + column: + needle.generatedColumn - (section.generatedOffset.generatedLine === needle.generatedLine - ? section.generatedOffset.generatedColumn - 1 - : 0), - bias: aArgs.bias - }); + ? section.generatedOffset.generatedColumn - 1 + : 0), + bias: aArgs.bias, + }) } /** @@ -2693,9 +2823,9 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { * map, false otherwise. */ hasContentsOfAllSources() { - return this._sections.every(function(s) { - return s.consumer.hasContentsOfAllSources(); - }); + return this._sections.every(function (s) { + return s.consumer.hasContentsOfAllSources() + }) } /** @@ -2709,13 +2839,13 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { const content = section.consumer.sourceContentFor(aSource, true); if (content) { - return content; + return content } } if (nullOnMissing) { - return null; + return null } - throw new Error('"' + aSource + '" is not in the SourceMap.'); + throw new Error('"' + aSource + '" is not in the SourceMap.') } /** @@ -2742,27 +2872,31 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // Only consider this section if the requested source is in the list of // sources of the consumer. - if (section.consumer._findSourceIndex(util.getArg(aArgs, "source")) === -1) { - continue; + if ( + section.consumer._findSourceIndex(util.getArg(aArgs, 'source')) === -1 + ) { + continue } const generatedPosition = section.consumer.generatedPositionFor(aArgs); if (generatedPosition) { const ret = { - line: generatedPosition.line + + line: + generatedPosition.line + (section.generatedOffset.generatedLine - 1), - column: generatedPosition.column + + column: + generatedPosition.column + (section.generatedOffset.generatedLine === generatedPosition.line - ? section.generatedOffset.generatedColumn - 1 - : 0) + ? section.generatedOffset.generatedColumn - 1 + : 0), }; - return ret; + return ret } } return { line: null, - column: null - }; + column: null, + } } /** @@ -2771,13 +2905,13 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { * `this.__originalMappings` properties). */ _parseMappings(aStr, aSourceRoot) { - const generatedMappings = this.__generatedMappingsUnsorted = []; - const originalMappings = this.__originalMappingsUnsorted = []; + const generatedMappings = (this.__generatedMappingsUnsorted = []); + const originalMappings = (this.__originalMappingsUnsorted = []); for (let i = 0; i < this._sections.length; i++) { const section = this._sections[i]; const sectionMappings = []; - section.consumer.eachMapping(m => sectionMappings.push(m)); + section.consumer.eachMapping((m) => sectionMappings.push(m)); for (let j = 0; j < sectionMappings.length; j++) { const mapping = sectionMappings[j]; @@ -2786,7 +2920,11 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // `source`, which would actually have gotten used as null because // var's get hoisted. // See: https://github.com/mozilla/source-map/issues/333 - let source = util.computeSourceURL(section.consumer.sourceRoot, null, this._sourceMapURL); + let source = util.computeSourceURL( + section.consumer.sourceRoot, + null, + this._sourceMapURL + ); this._sources.add(source); source = this._sources.indexOf(source); @@ -2802,19 +2940,20 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // generated file. const adjustedMapping = { source, - generatedLine: mapping.generatedLine + - (section.generatedOffset.generatedLine - 1), - generatedColumn: mapping.generatedColumn + + generatedLine: + mapping.generatedLine + (section.generatedOffset.generatedLine - 1), + generatedColumn: + mapping.generatedColumn + (section.generatedOffset.generatedLine === mapping.generatedLine - ? section.generatedOffset.generatedColumn - 1 - : 0), + ? section.generatedOffset.generatedColumn - 1 + : 0), originalLine: mapping.originalLine, originalColumn: mapping.originalColumn, - name + name, }; generatedMappings.push(adjustedMapping); - if (typeof adjustedMapping.originalLine === "number") { + if (typeof adjustedMapping.originalLine === 'number') { originalMappings.push(adjustedMapping); } } @@ -2827,91 +2966,96 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { let mappings; switch (order) { - case SourceMapConsumer$1.GENERATED_ORDER: - mappings = this._generatedMappings; - break; - case SourceMapConsumer$1.ORIGINAL_ORDER: - mappings = this._originalMappings; - break; - default: - throw new Error("Unknown order of iteration."); + case SourceMapConsumer$1.GENERATED_ORDER: + mappings = this._generatedMappings; + break + case SourceMapConsumer$1.ORIGINAL_ORDER: + mappings = this._originalMappings; + break + default: + throw new Error('Unknown order of iteration.') } const sourceRoot = this.sourceRoot; - mappings.map(function(mapping) { - let source = null; - if (mapping.source !== null) { - source = this._sources.at(mapping.source); - source = util.computeSourceURL(sourceRoot, source, this._sourceMapURL); - } - return { - source, - generatedLine: mapping.generatedLine, - generatedColumn: mapping.generatedColumn, - originalLine: mapping.originalLine, - originalColumn: mapping.originalColumn, - name: mapping.name === null ? null : this._names.at(mapping.name) - }; - }, this).forEach(aCallback, context); + mappings + .map(function (mapping) { + let source = null; + if (mapping.source !== null) { + source = this._sources.at(mapping.source); + source = util.computeSourceURL(sourceRoot, source, this._sourceMapURL); + } + return { + source, + generatedLine: mapping.generatedLine, + generatedColumn: mapping.generatedColumn, + originalLine: mapping.originalLine, + originalColumn: mapping.originalColumn, + name: mapping.name === null ? null : this._names.at(mapping.name), + } + }, this) + .forEach(aCallback, context); } /** * Find the mapping that best matches the hypothetical "needle" mapping that * we are searching for in the given "haystack" of mappings. */ - _findMapping(aNeedle, aMappings, aLineName, - aColumnName, aComparator, aBias) { + _findMapping(aNeedle, aMappings, aLineName, aColumnName, aComparator, aBias) { // To return the position we are searching for, we must first find the // mapping for the given position and then return the opposite position it // points to. Because the mappings are sorted, we can use binary search to // find the best mapping. if (aNeedle[aLineName] <= 0) { - throw new TypeError("Line must be greater than or equal to 1, got " - + aNeedle[aLineName]); + throw new TypeError( + 'Line must be greater than or equal to 1, got ' + aNeedle[aLineName] + ) } if (aNeedle[aColumnName] < 0) { - throw new TypeError("Column must be greater than or equal to 0, got " - + aNeedle[aColumnName]); + throw new TypeError( + 'Column must be greater than or equal to 0, got ' + aNeedle[aColumnName] + ) } - return binarySearch.search(aNeedle, aMappings, aComparator, aBias); + return binarySearch.search(aNeedle, aMappings, aComparator, aBias) } allGeneratedPositionsFor(aArgs) { - const line = util.getArg(aArgs, "line"); + const line = util.getArg(aArgs, 'line'); // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping // returns the index of the closest mapping less than the needle. By // setting needle.originalColumn to 0, we thus find the last mapping for // the given line, provided such a mapping exists. const needle = { - source: util.getArg(aArgs, "source"), + source: util.getArg(aArgs, 'source'), originalLine: line, - originalColumn: util.getArg(aArgs, "column", 0) + originalColumn: util.getArg(aArgs, 'column', 0), }; needle.source = this._findSourceIndex(needle.source); if (needle.source < 0) { - return []; + return [] } if (needle.originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } const mappings = []; - let index = this._findMapping(needle, - this._originalMappings, - "originalLine", - "originalColumn", - util.compareByOriginalPositions, - binarySearch.LEAST_UPPER_BOUND); + let index = this._findMapping( + needle, + this._originalMappings, + 'originalLine', + 'originalColumn', + util.compareByOriginalPositions, + binarySearch.LEAST_UPPER_BOUND + ); if (index >= 0) { let mapping = this._originalMappings[index]; @@ -2928,8 +3072,8 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { lastColumn = Infinity; } mappings.push({ - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, }); @@ -2942,16 +3086,18 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // a mapping for a different line than the one we were searching for. // Since mappings are sorted, this is guaranteed to find all mappings for // the line we are searching for. - while (mapping && - mapping.originalLine === line && - mapping.originalColumn == originalColumn) { + while ( + mapping && + mapping.originalLine === line && + mapping.originalColumn == originalColumn + ) { let lastColumn = mapping.lastGeneratedColumn; if (this._computedColumnSpans && lastColumn === null) { lastColumn = Infinity; } mappings.push({ - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, }); @@ -2960,7 +3106,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { } } - return mappings; + return mappings } destroy() { @@ -2977,18 +3123,19 @@ var IndexedSourceMapConsumer_1 = IndexedSourceMapConsumer; */ function _factory(aSourceMap, aSourceMapURL) { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const consumer = sourceMap.sections != null + const consumer = + sourceMap.sections != null ? new IndexedSourceMapConsumer(sourceMap, aSourceMapURL) : new BasicSourceMapConsumer(sourceMap, aSourceMapURL); - return Promise.resolve(consumer); + return Promise.resolve(consumer) } function _factoryBSM(aSourceMap, aSourceMapURL) { - return BasicSourceMapConsumer.fromSourceMap(aSourceMap, aSourceMapURL); + return BasicSourceMapConsumer.fromSourceMap(aSourceMap, aSourceMapURL) } var sourceMapConsumer = { @@ -3020,7 +3167,7 @@ const NEWLINE_CODE = 10; // Private symbol for identifying `SourceNode`s when multiple versions of // the source-map library are loaded. This MUST NOT CHANGE across // versions! -const isSourceNode = "$$$isSourceNode$$$"; +const isSourceNode = '$$$isSourceNode$$$'; /** * SourceNodes provide a way to abstract over interpolating/concatenating @@ -3054,7 +3201,11 @@ class SourceNode { * @param aRelativePath Optional. The path that relative sources in the * SourceMapConsumer should be relative to. */ - static fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) { + static fromStringWithSourceMap( + aGeneratedCode, + aSourceMapConsumer, + aRelativePath + ) { // The SourceNode we want to fill with the generated code // and the SourceMap const node = new SourceNode(); @@ -3065,20 +3216,22 @@ class SourceNode { // Processed fragments are accessed by calling `shiftNextLine`. const remainingLines = aGeneratedCode.split(REGEX_NEWLINE); let remainingLinesIndex = 0; - const shiftNextLine = function() { + const shiftNextLine = function () { const lineContents = getNextLine(); // The last line of a file might not have a newline. - const newLine = getNextLine() || ""; - return lineContents + newLine; + const newLine = getNextLine() || ''; + return lineContents + newLine function getNextLine() { - return remainingLinesIndex < remainingLines.length ? - remainingLines[remainingLinesIndex++] : undefined; + return remainingLinesIndex < remainingLines.length + ? remainingLines[remainingLinesIndex++] + : undefined } }; // We need to remember the position of "remainingLines" - let lastGeneratedLine = 1, lastGeneratedColumn = 0; + let lastGeneratedLine = 1, + lastGeneratedColumn = 0; // The generate SourceNodes we need a code range. // To extract it current and last mapping is used. @@ -3086,7 +3239,7 @@ class SourceNode { let lastMapping = null; let nextLine; - aSourceMapConsumer.eachMapping(function(mapping) { + aSourceMapConsumer.eachMapping(function (mapping) { if (lastMapping !== null) { // We add the code from "lastMapping" to "mapping": // First check if there is a new line in between. @@ -3100,16 +3253,19 @@ class SourceNode { // There is no new line in between. // Associate the code between "lastGeneratedColumn" and // "mapping.generatedColumn" with "lastMapping" - nextLine = remainingLines[remainingLinesIndex] || ""; - const code = nextLine.substr(0, mapping.generatedColumn - - lastGeneratedColumn); - remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn - - lastGeneratedColumn); + nextLine = remainingLines[remainingLinesIndex] || ''; + const code = nextLine.substr( + 0, + mapping.generatedColumn - lastGeneratedColumn + ); + remainingLines[remainingLinesIndex] = nextLine.substr( + mapping.generatedColumn - lastGeneratedColumn + ); lastGeneratedColumn = mapping.generatedColumn; addMappingWithCode(lastMapping, code); // No more remaining code, continue lastMapping = mapping; - return; + return } } // We add the generated code until the first mapping @@ -3120,9 +3276,11 @@ class SourceNode { lastGeneratedLine++; } if (lastGeneratedColumn < mapping.generatedColumn) { - nextLine = remainingLines[remainingLinesIndex] || ""; + nextLine = remainingLines[remainingLinesIndex] || ''; node.add(nextLine.substr(0, mapping.generatedColumn)); - remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn); + remainingLines[remainingLinesIndex] = nextLine.substr( + mapping.generatedColumn + ); lastGeneratedColumn = mapping.generatedColumn; } lastMapping = mapping; @@ -3134,11 +3292,11 @@ class SourceNode { addMappingWithCode(lastMapping, shiftNextLine()); } // and add the remaining lines without any mapping - node.add(remainingLines.splice(remainingLinesIndex).join("")); + node.add(remainingLines.splice(remainingLinesIndex).join('')); } // Copy sourcesContent into SourceNode - aSourceMapConsumer.sources.forEach(function(sourceFile) { + aSourceMapConsumer.sources.forEach(function (sourceFile) { const content = aSourceMapConsumer.sourceContentFor(sourceFile); if (content != null) { if (aRelativePath != null) { @@ -3148,7 +3306,7 @@ class SourceNode { } }); - return node; + return node function addMappingWithCode(mapping, code) { if (mapping === null || mapping.source === undefined) { @@ -3157,11 +3315,15 @@ class SourceNode { const source = aRelativePath ? util.join(aRelativePath, mapping.source) : mapping.source; - node.add(new SourceNode(mapping.originalLine, - mapping.originalColumn, - source, - code, - mapping.name)); + node.add( + new SourceNode( + mapping.originalLine, + mapping.originalColumn, + source, + code, + mapping.name + ) + ); } } } @@ -3174,19 +3336,20 @@ class SourceNode { */ add(aChunk) { if (Array.isArray(aChunk)) { - aChunk.forEach(function(chunk) { + aChunk.forEach(function (chunk) { this.add(chunk); }, this); - } else if (aChunk[isSourceNode] || typeof aChunk === "string") { + } else if (aChunk[isSourceNode] || typeof aChunk === 'string') { if (aChunk) { this.children.push(aChunk); } } else { throw new TypeError( - "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk - ); + 'Expected a SourceNode, string, or an array of SourceNodes and strings. Got ' + + aChunk + ) } - return this; + return this } /** @@ -3200,14 +3363,15 @@ class SourceNode { for (let i = aChunk.length - 1; i >= 0; i--) { this.prepend(aChunk[i]); } - } else if (aChunk[isSourceNode] || typeof aChunk === "string") { + } else if (aChunk[isSourceNode] || typeof aChunk === 'string') { this.children.unshift(aChunk); } else { throw new TypeError( - "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk - ); + 'Expected a SourceNode, string, or an array of SourceNodes and strings. Got ' + + aChunk + ) } - return this; + return this } /** @@ -3223,11 +3387,13 @@ class SourceNode { chunk = this.children[i]; if (chunk[isSourceNode]) { chunk.walk(aFn); - } else if (chunk !== "") { - aFn(chunk, { source: this.source, - line: this.line, - column: this.column, - name: this.name }); + } else if (chunk !== '') { + aFn(chunk, { + source: this.source, + line: this.line, + column: this.column, + name: this.name, + }); } } } @@ -3251,7 +3417,7 @@ class SourceNode { newChildren.push(this.children[i]); this.children = newChildren; } - return this; + return this } /** @@ -3265,12 +3431,15 @@ class SourceNode { const lastChild = this.children[this.children.length - 1]; if (lastChild[isSourceNode]) { lastChild.replaceRight(aPattern, aReplacement); - } else if (typeof lastChild === "string") { - this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement); + } else if (typeof lastChild === 'string') { + this.children[this.children.length - 1] = lastChild.replace( + aPattern, + aReplacement + ); } else { - this.children.push("".replace(aPattern, aReplacement)); + this.children.push(''.replace(aPattern, aReplacement)); } - return this; + return this } /** @@ -3308,11 +3477,11 @@ class SourceNode { * and concatenates all the various snippets together to one string. */ toString() { - let str = ""; - this.walk(function(chunk) { + let str = ''; + this.walk(function (chunk) { str += chunk; }); - return str; + return str } /** @@ -3321,9 +3490,9 @@ class SourceNode { */ toStringWithSourceMap(aArgs) { const generated = { - code: "", + code: '', line: 1, - column: 0 + column: 0, }; const map = new SourceMapGenerator(aArgs); let sourceMappingActive = false; @@ -3331,26 +3500,30 @@ class SourceNode { let lastOriginalLine = null; let lastOriginalColumn = null; let lastOriginalName = null; - this.walk(function(chunk, original) { + this.walk(function (chunk, original) { generated.code += chunk; - if (original.source !== null - && original.line !== null - && original.column !== null) { - if (lastOriginalSource !== original.source - || lastOriginalLine !== original.line - || lastOriginalColumn !== original.column - || lastOriginalName !== original.name) { + if ( + original.source !== null && + original.line !== null && + original.column !== null + ) { + if ( + lastOriginalSource !== original.source || + lastOriginalLine !== original.line || + lastOriginalColumn !== original.column || + lastOriginalName !== original.name + ) { map.addMapping({ source: original.source, original: { line: original.line, - column: original.column + column: original.column, }, generated: { line: generated.line, - column: generated.column + column: generated.column, }, - name: original.name + name: original.name, }); } lastOriginalSource = original.source; @@ -3362,8 +3535,8 @@ class SourceNode { map.addMapping({ generated: { line: generated.line, - column: generated.column - } + column: generated.column, + }, }); lastOriginalSource = null; sourceMappingActive = false; @@ -3381,13 +3554,13 @@ class SourceNode { source: original.source, original: { line: original.line, - column: original.column + column: original.column, }, generated: { line: generated.line, - column: generated.column + column: generated.column, }, - name: original.name + name: original.name, }); } } else { @@ -3395,11 +3568,11 @@ class SourceNode { } } }); - this.walkSourceContents(function(sourceFile, sourceContent) { + this.walkSourceContents(function (sourceFile, sourceContent) { map.setSourceContent(sourceFile, sourceContent); }); - return { code: generated.code, map }; + return { code: generated.code, map } } } @@ -3420,7 +3593,8 @@ var require$$2 = sourceNode; */ require$$0.SourceMapGenerator; -var SourceMapConsumer = require$$1.SourceMapConsumer; +var SourceMapConsumer = + require$$1.SourceMapConsumer; require$$2.SourceNode; const nixSlashes = (x) => x.replace(/\\/g, '/'); diff --git a/packages/uni-stacktracey/dist/uni-stacktracey.es.js b/packages/uni-stacktracey/dist/uni-stacktracey.es.js index ab8544583af029aeb85d86f9ea5cfdfc1bc02ba1..135fcadcb308b7048996d53146a9a59f95522c46 100644 --- a/packages/uni-stacktracey/dist/uni-stacktracey.es.js +++ b/packages/uni-stacktracey/dist/uni-stacktracey.es.js @@ -204,16 +204,17 @@ var StackTracey$1 = StackTracey; * http://opensource.org/licenses/BSD-3-Clause */ -const intToCharMap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""); +const intToCharMap = + 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split(''); /** * Encode an integer in the range of 0 to 63 to a single base 64 digit. */ -var encode$1 = function(number) { +var encode$1 = function (number) { if (0 <= number && number < intToCharMap.length) { - return intToCharMap[number]; + return intToCharMap[number] } - throw new TypeError("Must be between 0 and 63: " + number); + throw new TypeError('Must be between 0 and 63: ' + number) }; var base64$1 = { @@ -292,16 +293,14 @@ const VLQ_CONTINUATION_BIT = VLQ_BASE; * 2 becomes 4 (100 binary), -2 becomes 5 (101 binary) */ function toVLQSigned(aValue) { - return aValue < 0 - ? ((-aValue) << 1) + 1 - : (aValue << 1) + 0; + return aValue < 0 ? (-aValue << 1) + 1 : (aValue << 1) + 0 } /** * Returns the base 64 VLQ encoded value. */ var encode = function base64VLQ_encode(aValue) { - let encoded = ""; + let encoded = ''; let digit; let vlq = toVLQSigned(aValue); @@ -315,9 +314,9 @@ var encode = function base64VLQ_encode(aValue) { digit |= VLQ_CONTINUATION_BIT; } encoded += base64.encode(digit); - } while (vlq > 0); + } while (vlq > 0) - return encoded; + return encoded }; var base64Vlq = { @@ -350,52 +349,52 @@ var util$1 = createCommonjsModule(function (module, exports) { */ function getArg(aArgs, aName, aDefaultValue) { if (aName in aArgs) { - return aArgs[aName]; + return aArgs[aName] } else if (arguments.length === 3) { - return aDefaultValue; + return aDefaultValue } - throw new Error('"' + aName + '" is a required argument.'); - + throw new Error('"' + aName + '" is a required argument.') } exports.getArg = getArg; -const urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/; +const urlRegexp = + /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.-]*)(?::(\d+))?(.*)$/; const dataUrlRegexp = /^data:.+\,.+$/; function urlParse(aUrl) { const match = aUrl.match(urlRegexp); if (!match) { - return null; + return null } return { scheme: match[1], auth: match[2], host: match[3], port: match[4], - path: match[5] - }; + path: match[5], + } } exports.urlParse = urlParse; function urlGenerate(aParsedUrl) { - let url = ""; + let url = ''; if (aParsedUrl.scheme) { - url += aParsedUrl.scheme + ":"; + url += aParsedUrl.scheme + ':'; } - url += "//"; + url += '//'; if (aParsedUrl.auth) { - url += aParsedUrl.auth + "@"; + url += aParsedUrl.auth + '@'; } if (aParsedUrl.host) { url += aParsedUrl.host; } if (aParsedUrl.port) { - url += ":" + aParsedUrl.port; + url += ':' + aParsedUrl.port; } if (aParsedUrl.path) { url += aParsedUrl.path; } - return url; + return url } exports.urlGenerate = urlGenerate; @@ -411,13 +410,13 @@ const MAX_CACHED_INPUTS = 32; function lruMemoize(f) { const cache = []; - return function(input) { + return function (input) { for (let i = 0; i < cache.length; i++) { if (cache[i].input === input) { const temp = cache[0]; cache[0] = cache[i]; cache[i] = temp; - return cache[0].result; + return cache[0].result } } @@ -432,8 +431,8 @@ function lruMemoize(f) { cache.pop(); } - return result; - }; + return result + } } /** @@ -452,7 +451,7 @@ const normalize = lruMemoize(function normalize(aPath) { const url = urlParse(aPath); if (url) { if (!url.path) { - return aPath; + return aPath } path = url.path; } @@ -465,13 +464,13 @@ const normalize = lruMemoize(function normalize(aPath) { let i = 0; while (true) { start = i; - i = path.indexOf("/", start); + i = path.indexOf('/', start); if (i === -1) { parts.push(path.slice(start)); - break; + break } else { parts.push(path.slice(start, i)); - while (i < path.length && path[i] === "/") { + while (i < path.length && path[i] === '/') { i++; } } @@ -480,12 +479,12 @@ const normalize = lruMemoize(function normalize(aPath) { let up = 0; for (i = parts.length - 1; i >= 0; i--) { const part = parts[i]; - if (part === ".") { + if (part === '.') { parts.splice(i, 1); - } else if (part === "..") { + } else if (part === '..') { up++; } else if (up > 0) { - if (part === "") { + if (part === '') { // The first part is blank if the path is absolute. Trying to go // above the root is a no-op. Therefore we can remove all '..' parts // directly after the root. @@ -497,17 +496,17 @@ const normalize = lruMemoize(function normalize(aPath) { } } } - path = parts.join("/"); + path = parts.join('/'); - if (path === "") { - path = isAbsolute ? "/" : "."; + if (path === '') { + path = isAbsolute ? '/' : '.'; } if (url) { url.path = path; - return urlGenerate(url); + return urlGenerate(url) } - return path; + return path }); exports.normalize = normalize; @@ -528,16 +527,16 @@ exports.normalize = normalize; * - Joining for example 'http://' and 'www.example.com' is also supported. */ function join(aRoot, aPath) { - if (aRoot === "") { - aRoot = "."; + if (aRoot === '') { + aRoot = '.'; } - if (aPath === "") { - aPath = "."; + if (aPath === '') { + aPath = '.'; } const aPathUrl = urlParse(aPath); const aRootUrl = urlParse(aRoot); if (aRootUrl) { - aRoot = aRootUrl.path || "/"; + aRoot = aRootUrl.path || '/'; } // `join(foo, '//www.example.org')` @@ -545,33 +544,34 @@ function join(aRoot, aPath) { if (aRootUrl) { aPathUrl.scheme = aRootUrl.scheme; } - return urlGenerate(aPathUrl); + return urlGenerate(aPathUrl) } if (aPathUrl || aPath.match(dataUrlRegexp)) { - return aPath; + return aPath } // `join('http://', 'www.example.com')` if (aRootUrl && !aRootUrl.host && !aRootUrl.path) { aRootUrl.host = aPath; - return urlGenerate(aRootUrl); + return urlGenerate(aRootUrl) } - const joined = aPath.charAt(0) === "/" - ? aPath - : normalize(aRoot.replace(/\/+$/, "") + "/" + aPath); + const joined = + aPath.charAt(0) === '/' + ? aPath + : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath); if (aRootUrl) { aRootUrl.path = joined; - return urlGenerate(aRootUrl); + return urlGenerate(aRootUrl) } - return joined; + return joined } exports.join = join; -exports.isAbsolute = function(aPath) { - return aPath.charAt(0) === "/" || urlRegexp.test(aPath); +exports.isAbsolute = function (aPath) { + return aPath.charAt(0) === '/' || urlRegexp.test(aPath) }; /** @@ -581,21 +581,21 @@ exports.isAbsolute = function(aPath) { * @param aPath The path or URL to be made relative to aRoot. */ function relative(aRoot, aPath) { - if (aRoot === "") { - aRoot = "."; + if (aRoot === '') { + aRoot = '.'; } - aRoot = aRoot.replace(/\/$/, ""); + aRoot = aRoot.replace(/\/$/, ''); // It is possible for the path to be above the root. In this case, simply // checking whether the root is a prefix of the path won't work. Instead, we // need to remove components from the root one by one, until either we find // a prefix that fits, or we run out of components to remove. let level = 0; - while (aPath.indexOf(aRoot + "/") !== 0) { - const index = aRoot.lastIndexOf("/"); + while (aPath.indexOf(aRoot + '/') !== 0) { + const index = aRoot.lastIndexOf('/'); if (index < 0) { - return aPath; + return aPath } // If the only part of the root that is left is the scheme (i.e. http://, @@ -603,24 +603,24 @@ function relative(aRoot, aPath) { // have exhausted all components, so the path is not relative to the root. aRoot = aRoot.slice(0, index); if (aRoot.match(/^([^\/]+:\/)?\/*$/)) { - return aPath; + return aPath } ++level; } // Make sure we add a "../" for each component we removed from the root. - return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1); + return Array(level + 1).join('../') + aPath.substr(aRoot.length + 1) } exports.relative = relative; -const supportsNullProto = (function() { +const supportsNullProto = (function () { const obj = Object.create(null); - return !("__proto__" in obj); -}()); + return !('__proto__' in obj) +})(); function identity(s) { - return s; + return s } /** @@ -634,54 +634,56 @@ function identity(s) { */ function toSetString(aStr) { if (isProtoString(aStr)) { - return "$" + aStr; + return '$' + aStr } - return aStr; + return aStr } exports.toSetString = supportsNullProto ? identity : toSetString; function fromSetString(aStr) { if (isProtoString(aStr)) { - return aStr.slice(1); + return aStr.slice(1) } - return aStr; + return aStr } exports.fromSetString = supportsNullProto ? identity : fromSetString; function isProtoString(s) { if (!s) { - return false; + return false } const length = s.length; if (length < 9 /* "__proto__".length */) { - return false; + return false } /* eslint-disable no-multi-spaces */ - if (s.charCodeAt(length - 1) !== 95 /* '_' */ || - s.charCodeAt(length - 2) !== 95 /* '_' */ || - s.charCodeAt(length - 3) !== 111 /* 'o' */ || - s.charCodeAt(length - 4) !== 116 /* 't' */ || - s.charCodeAt(length - 5) !== 111 /* 'o' */ || - s.charCodeAt(length - 6) !== 114 /* 'r' */ || - s.charCodeAt(length - 7) !== 112 /* 'p' */ || - s.charCodeAt(length - 8) !== 95 /* '_' */ || - s.charCodeAt(length - 9) !== 95 /* '_' */) { - return false; + if ( + s.charCodeAt(length - 1) !== 95 /* '_' */ || + s.charCodeAt(length - 2) !== 95 /* '_' */ || + s.charCodeAt(length - 3) !== 111 /* 'o' */ || + s.charCodeAt(length - 4) !== 116 /* 't' */ || + s.charCodeAt(length - 5) !== 111 /* 'o' */ || + s.charCodeAt(length - 6) !== 114 /* 'r' */ || + s.charCodeAt(length - 7) !== 112 /* 'p' */ || + s.charCodeAt(length - 8) !== 95 /* '_' */ || + s.charCodeAt(length - 9) !== 95 /* '_' */ + ) { + return false } /* eslint-enable no-multi-spaces */ for (let i = length - 10; i >= 0; i--) { if (s.charCodeAt(i) !== 36 /* '$' */) { - return false; + return false } } - return true; + return true } /** @@ -695,30 +697,30 @@ function isProtoString(s) { function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) { let cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0 || onlyCompareOriginal) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } exports.compareByOriginalPositions = compareByOriginalPositions; @@ -731,54 +733,59 @@ exports.compareByOriginalPositions = compareByOriginalPositions; * source/name/original line and column the same. Useful when searching for a * mapping with a stubbed out mapping. */ -function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) { +function compareByGeneratedPositionsDeflated( + mappingA, + mappingB, + onlyCompareGenerated +) { let cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0 || onlyCompareGenerated) { - return cmp; + return cmp } cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } -exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated; +exports.compareByGeneratedPositionsDeflated = + compareByGeneratedPositionsDeflated; function strcmp(aStr1, aStr2) { if (aStr1 === aStr2) { - return 0; + return 0 } if (aStr1 === null) { - return 1; // aStr2 !== null + return 1 // aStr2 !== null } if (aStr2 === null) { - return -1; // aStr1 !== null + return -1 // aStr1 !== null } if (aStr1 > aStr2) { - return 1; + return 1 } - return -1; + return -1 } /** @@ -788,32 +795,33 @@ function strcmp(aStr1, aStr2) { function compareByGeneratedPositionsInflated(mappingA, mappingB) { let cmp = mappingA.generatedLine - mappingB.generatedLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.generatedColumn - mappingB.generatedColumn; if (cmp !== 0) { - return cmp; + return cmp } cmp = strcmp(mappingA.source, mappingB.source); if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalLine - mappingB.originalLine; if (cmp !== 0) { - return cmp; + return cmp } cmp = mappingA.originalColumn - mappingB.originalColumn; if (cmp !== 0) { - return cmp; + return cmp } - return strcmp(mappingA.name, mappingB.name); + return strcmp(mappingA.name, mappingB.name) } -exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated; +exports.compareByGeneratedPositionsInflated = + compareByGeneratedPositionsInflated; /** * Strip any JSON XSSI avoidance prefix from the string (as documented @@ -821,7 +829,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate * JSON. */ function parseSourceMapInput(str) { - return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, "")); + return JSON.parse(str.replace(/^\)]}'[^\n]*\n/, '')) } exports.parseSourceMapInput = parseSourceMapInput; @@ -830,12 +838,12 @@ exports.parseSourceMapInput = parseSourceMapInput; * URL, and the source map's URL. */ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { - sourceURL = sourceURL || ""; + sourceURL = sourceURL || ''; if (sourceRoot) { // This follows what Chrome does. - if (sourceRoot[sourceRoot.length - 1] !== "/" && sourceURL[0] !== "/") { - sourceRoot += "/"; + if (sourceRoot[sourceRoot.length - 1] !== '/' && sourceURL[0] !== '/') { + sourceRoot += '/'; } // The spec says: // Line 4: An optional source root, useful for relocating source @@ -862,11 +870,11 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { if (sourceMapURL) { const parsed = urlParse(sourceMapURL); if (!parsed) { - throw new Error("sourceMapURL could not be parsed"); + throw new Error('sourceMapURL could not be parsed') } if (parsed.path) { // Strip the last path component, but keep the "/". - const index = parsed.path.lastIndexOf("/"); + const index = parsed.path.lastIndexOf('/'); if (index >= 0) { parsed.path = parsed.path.substring(0, index + 1); } @@ -874,7 +882,7 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) { sourceURL = join(urlGenerate(parsed), sourceURL); } - return normalize(sourceURL); + return normalize(sourceURL) } exports.computeSourceURL = computeSourceURL; }); @@ -906,7 +914,7 @@ class ArraySet$2 { for (let i = 0, len = aArray.length; i < len; i++) { set.add(aArray[i], aAllowDuplicates); } - return set; + return set } /** @@ -916,7 +924,7 @@ class ArraySet$2 { * @returns Number */ size() { - return this._set.size; + return this._set.size } /** @@ -941,7 +949,7 @@ class ArraySet$2 { * @param String aStr */ has(aStr) { - return this._set.has(aStr); + return this._set.has(aStr) } /** @@ -952,9 +960,9 @@ class ArraySet$2 { indexOf(aStr) { const idx = this._set.get(aStr); if (idx >= 0) { - return idx; + return idx } - throw new Error('"' + aStr + '" is not in the set.'); + throw new Error('"' + aStr + '" is not in the set.') } /** @@ -964,9 +972,9 @@ class ArraySet$2 { */ at(aIdx) { if (aIdx >= 0 && aIdx < this._array.length) { - return this._array[aIdx]; + return this._array[aIdx] } - throw new Error("No element indexed by " + aIdx); + throw new Error('No element indexed by ' + aIdx) } /** @@ -975,7 +983,7 @@ class ArraySet$2 { * for storing the members so that no one can mess with internal state. */ toArray() { - return this._array.slice(); + return this._array.slice() } } var ArraySet_1 = ArraySet$2; @@ -1006,8 +1014,11 @@ function generatedPositionAfter(mappingA, mappingB) { const lineB = mappingB.generatedLine; const columnA = mappingA.generatedColumn; const columnB = mappingB.generatedColumn; - return lineB > lineA || lineB == lineA && columnB >= columnA || - util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0; + return ( + lineB > lineA || + (lineB == lineA && columnB >= columnA) || + util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0 + ) } /** @@ -1020,7 +1031,7 @@ class MappingList$1 { this._array = []; this._sorted = true; // Serves as infimum - this._last = {generatedLine: -1, generatedColumn: 0}; + this._last = { generatedLine: -1, generatedColumn: 0 }; } /** @@ -1062,7 +1073,7 @@ class MappingList$1 { this._array.sort(util.compareByGeneratedPositionsInflated); this._sorted = true; } - return this._array; + return this._array } } @@ -1104,9 +1115,9 @@ class SourceMapGenerator$1 { if (!aArgs) { aArgs = {}; } - this._file = util.getArg(aArgs, "file", null); - this._sourceRoot = util.getArg(aArgs, "sourceRoot", null); - this._skipValidation = util.getArg(aArgs, "skipValidation", false); + this._file = util.getArg(aArgs, 'file', null); + this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null); + this._skipValidation = util.getArg(aArgs, 'skipValidation', false); this._sources = new ArraySet$1(); this._names = new ArraySet$1(); this._mappings = new MappingList(); @@ -1122,14 +1133,14 @@ class SourceMapGenerator$1 { const sourceRoot = aSourceMapConsumer.sourceRoot; const generator = new SourceMapGenerator$1({ file: aSourceMapConsumer.file, - sourceRoot + sourceRoot, }); - aSourceMapConsumer.eachMapping(function(mapping) { + aSourceMapConsumer.eachMapping(function (mapping) { const newMapping = { generated: { line: mapping.generatedLine, - column: mapping.generatedColumn - } + column: mapping.generatedColumn, + }, }; if (mapping.source != null) { @@ -1140,7 +1151,7 @@ class SourceMapGenerator$1 { newMapping.original = { line: mapping.originalLine, - column: mapping.originalColumn + column: mapping.originalColumn, }; if (mapping.name != null) { @@ -1150,7 +1161,7 @@ class SourceMapGenerator$1 { generator.addMapping(newMapping); }); - aSourceMapConsumer.sources.forEach(function(sourceFile) { + aSourceMapConsumer.sources.forEach(function (sourceFile) { let sourceRelative = sourceFile; if (sourceRoot !== null) { sourceRelative = util.relative(sourceRoot, sourceFile); @@ -1165,7 +1176,7 @@ class SourceMapGenerator$1 { generator.setSourceContent(sourceFile, content); } }); - return generator; + return generator } /** @@ -1179,10 +1190,10 @@ class SourceMapGenerator$1 { * - name: An optional original token name for this mapping. */ addMapping(aArgs) { - const generated = util.getArg(aArgs, "generated"); - const original = util.getArg(aArgs, "original", null); - let source = util.getArg(aArgs, "source", null); - let name = util.getArg(aArgs, "name", null); + const generated = util.getArg(aArgs, 'generated'); + const original = util.getArg(aArgs, 'original', null); + let source = util.getArg(aArgs, 'source', null); + let name = util.getArg(aArgs, 'name', null); if (!this._skipValidation) { this._validateMapping(generated, original, source, name); @@ -1208,7 +1219,7 @@ class SourceMapGenerator$1 { originalLine: original != null && original.line, originalColumn: original != null && original.column, source, - name + name, }); } @@ -1260,9 +1271,9 @@ class SourceMapGenerator$1 { if (aSourceFile == null) { if (aSourceMapConsumer.file == null) { throw new Error( - "SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, " + - 'or the source map\'s "file" property. Both were omitted.' - ); + 'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' + + 'or the source map\'s "file" property. Both were omitted.' + ) } sourceFile = aSourceMapConsumer.file; } @@ -1273,18 +1284,17 @@ class SourceMapGenerator$1 { } // Applying the SourceMap can add and remove items from the sources and // the names array. - const newSources = this._mappings.toArray().length > 0 - ? new ArraySet$1() - : this._sources; + const newSources = + this._mappings.toArray().length > 0 ? new ArraySet$1() : this._sources; const newNames = new ArraySet$1(); // Find mappings for the "sourceFile" - this._mappings.unsortedForEach(function(mapping) { + this._mappings.unsortedForEach(function (mapping) { if (mapping.source === sourceFile && mapping.originalLine != null) { // Check if it can be mapped by the source map, then update the mapping. const original = aSourceMapConsumer.originalPositionFor({ line: mapping.originalLine, - column: mapping.originalColumn + column: mapping.originalColumn, }); if (original.source != null) { // Copy mapping @@ -1312,13 +1322,12 @@ class SourceMapGenerator$1 { if (name != null && !newNames.has(name)) { newNames.add(name); } - }, this); this._sources = newSources; this._names = newNames; // Copy sourcesContents of applied map. - aSourceMapConsumer.sources.forEach(function(srcFile) { + aSourceMapConsumer.sources.forEach(function (srcFile) { const content = aSourceMapConsumer.sourceContentFor(srcFile); if (content != null) { if (aSourceMapPath != null) { @@ -1348,27 +1357,49 @@ class SourceMapGenerator$1 { // it is most likely a programmer error. In this case we throw a very // specific error message to try to guide them the right way. // For example: https://github.com/Polymer/polymer-bundler/pull/519 - if (aOriginal && typeof aOriginal.line !== "number" && typeof aOriginal.column !== "number") { - throw new Error( - "original.line and original.column are not numbers -- you probably meant to omit " + - "the original mapping entirely and only map the generated position. If so, pass " + - "null for the original mapping instead of an object with empty or null values." - ); - } - - if (aGenerated && "line" in aGenerated && "column" in aGenerated - && aGenerated.line > 0 && aGenerated.column >= 0 - && !aOriginal && !aSource && !aName) ; else if (aGenerated && "line" in aGenerated && "column" in aGenerated - && aOriginal && "line" in aOriginal && "column" in aOriginal - && aGenerated.line > 0 && aGenerated.column >= 0 - && aOriginal.line > 0 && aOriginal.column >= 0 - && aSource) ; else { - throw new Error("Invalid mapping: " + JSON.stringify({ - generated: aGenerated, - source: aSource, - original: aOriginal, - name: aName - })); + if ( + aOriginal && + typeof aOriginal.line !== 'number' && + typeof aOriginal.column !== 'number' + ) { + throw new Error( + 'original.line and original.column are not numbers -- you probably meant to omit ' + + 'the original mapping entirely and only map the generated position. If so, pass ' + + 'null for the original mapping instead of an object with empty or null values.' + ) + } + + if ( + aGenerated && + 'line' in aGenerated && + 'column' in aGenerated && + aGenerated.line > 0 && + aGenerated.column >= 0 && + !aOriginal && + !aSource && + !aName + ) ; else if ( + aGenerated && + 'line' in aGenerated && + 'column' in aGenerated && + aOriginal && + 'line' in aOriginal && + 'column' in aOriginal && + aGenerated.line > 0 && + aGenerated.column >= 0 && + aOriginal.line > 0 && + aOriginal.column >= 0 && + aSource + ) ; else { + throw new Error( + 'Invalid mapping: ' + + JSON.stringify({ + generated: aGenerated, + source: aSource, + original: aOriginal, + name: aName, + }) + ) } } @@ -1383,7 +1414,7 @@ class SourceMapGenerator$1 { let previousOriginalLine = 0; let previousName = 0; let previousSource = 0; - let result = ""; + let result = ''; let next; let mapping; let nameIdx; @@ -1392,23 +1423,26 @@ class SourceMapGenerator$1 { const mappings = this._mappings.toArray(); for (let i = 0, len = mappings.length; i < len; i++) { mapping = mappings[i]; - next = ""; + next = ''; if (mapping.generatedLine !== previousGeneratedLine) { previousGeneratedColumn = 0; while (mapping.generatedLine !== previousGeneratedLine) { - next += ";"; + next += ';'; previousGeneratedLine++; } } else if (i > 0) { - if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) { - continue; + if ( + !util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1]) + ) { + continue } - next += ","; + next += ','; } - next += base64VLQ.encode(mapping.generatedColumn - - previousGeneratedColumn); + next += base64VLQ.encode( + mapping.generatedColumn - previousGeneratedColumn + ); previousGeneratedColumn = mapping.generatedColumn; if (mapping.source != null) { @@ -1417,12 +1451,14 @@ class SourceMapGenerator$1 { previousSource = sourceIdx; // lines are stored 0-based in SourceMap spec version 3 - next += base64VLQ.encode(mapping.originalLine - 1 - - previousOriginalLine); + next += base64VLQ.encode( + mapping.originalLine - 1 - previousOriginalLine + ); previousOriginalLine = mapping.originalLine - 1; - next += base64VLQ.encode(mapping.originalColumn - - previousOriginalColumn); + next += base64VLQ.encode( + mapping.originalColumn - previousOriginalColumn + ); previousOriginalColumn = mapping.originalColumn; if (mapping.name != null) { @@ -1435,13 +1471,13 @@ class SourceMapGenerator$1 { result += next; } - return result; + return result } _generateSourcesContent(aSources, aSourceRoot) { - return aSources.map(function(source) { + return aSources.map(function (source) { if (!this._sourcesContents) { - return null; + return null } if (aSourceRoot != null) { source = util.relative(aSourceRoot, source); @@ -1449,8 +1485,8 @@ class SourceMapGenerator$1 { const key = util.toSetString(source); return Object.prototype.hasOwnProperty.call(this._sourcesContents, key) ? this._sourcesContents[key] - : null; - }, this); + : null + }, this) } /** @@ -1461,7 +1497,7 @@ class SourceMapGenerator$1 { version: this._version, sources: this._sources.toArray(), names: this._names.toArray(), - mappings: this._serializeMappings() + mappings: this._serializeMappings(), }; if (this._file != null) { map.file = this._file; @@ -1470,17 +1506,20 @@ class SourceMapGenerator$1 { map.sourceRoot = this._sourceRoot; } if (this._sourcesContents) { - map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot); + map.sourcesContent = this._generateSourcesContent( + map.sources, + map.sourceRoot + ); } - return map; + return map } /** * Render the source map being generated to a string. */ toString() { - return JSON.stringify(this.toJSON()); + return JSON.stringify(this.toJSON()) } } @@ -1530,33 +1569,33 @@ function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) { const cmp = aCompare(aNeedle, aHaystack[mid], true); if (cmp === 0) { // Found the element we are looking for. - return mid; + return mid } else if (cmp > 0) { // Our needle is greater than aHaystack[mid]. if (aHigh - mid > 1) { // The element is in the upper half. - return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias); + return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias) } // The exact needle element was not found in this haystack. Determine if // we are in termination case (3) or (2) and return the appropriate thing. if (aBias == exports.LEAST_UPPER_BOUND) { - return aHigh < aHaystack.length ? aHigh : -1; + return aHigh < aHaystack.length ? aHigh : -1 } - return mid; + return mid } // Our needle is less than aHaystack[mid]. if (mid - aLow > 1) { // The element is in the lower half. - return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias); + return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias) } // we are in termination case (3) or (2) and return the appropriate thing. if (aBias == exports.LEAST_UPPER_BOUND) { - return mid; + return mid } - return aLow < 0 ? -1 : aLow; + return aLow < 0 ? -1 : aLow } /** @@ -1579,13 +1618,19 @@ function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) { */ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { if (aHaystack.length === 0) { - return -1; + return -1 } - let index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack, - aCompare, aBias || exports.GREATEST_LOWER_BOUND); + let index = recursiveSearch( + -1, + aHaystack.length, + aNeedle, + aHaystack, + aCompare, + aBias || exports.GREATEST_LOWER_BOUND + ); if (index < 0) { - return -1; + return -1 } // We have found either the exact element, or the next-closest element than @@ -1593,12 +1638,12 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { // element. Make sure we always return the smallest of these. while (index - 1 >= 0) { if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) { - break; + break } --index; } - return index; + return index }; }); @@ -1611,20 +1656,21 @@ var readWasm$1 = createCommonjsModule(function (module) { let mappingsWasm = null; module.exports = function readWasm() { - if (typeof mappingsWasm === "string") { - return fetch(mappingsWasm) - .then(response => response.arrayBuffer()); + if (typeof mappingsWasm === 'string') { + return fetch(mappingsWasm).then((response) => response.arrayBuffer()) } if (mappingsWasm instanceof ArrayBuffer) { - return Promise.resolve(mappingsWasm); - } - throw new Error("You must provide the string URL or ArrayBuffer contents " + - "of lib/mappings.wasm by calling " + - "SourceMapConsumer.initialize({ 'lib/mappings.wasm': ... }) " + - "before using SourceMapConsumer"); + return Promise.resolve(mappingsWasm) + } + throw new Error( + 'You must provide the string URL or ArrayBuffer contents ' + + 'of lib/mappings.wasm by calling ' + + "SourceMapConsumer.initialize({ 'lib/mappings.wasm': ... }) " + + 'before using SourceMapConsumer' + ) }; - module.exports.initialize = input => mappingsWasm = input; + module.exports.initialize = (input) => (mappingsWasm = input); } }); @@ -1647,12 +1693,13 @@ let cachedWasm = null; var wasm$1 = function wasm() { if (cachedWasm) { - return cachedWasm; + return cachedWasm } const callbackStack = []; - cachedWasm = readWasm().then(buffer => { + cachedWasm = readWasm() + .then((buffer) => { return WebAssembly.instantiate(buffer, { env: { mapping_callback( @@ -1694,46 +1741,76 @@ var wasm$1 = function wasm() { callbackStack[callbackStack.length - 1](mapping); }, - start_all_generated_locations_for() { console.time("all_generated_locations_for"); }, - end_all_generated_locations_for() { console.timeEnd("all_generated_locations_for"); }, + start_all_generated_locations_for() { + console.time('all_generated_locations_for'); + }, + end_all_generated_locations_for() { + console.timeEnd('all_generated_locations_for'); + }, - start_compute_column_spans() { console.time("compute_column_spans"); }, - end_compute_column_spans() { console.timeEnd("compute_column_spans"); }, + start_compute_column_spans() { + console.time('compute_column_spans'); + }, + end_compute_column_spans() { + console.timeEnd('compute_column_spans'); + }, - start_generated_location_for() { console.time("generated_location_for"); }, - end_generated_location_for() { console.timeEnd("generated_location_for"); }, + start_generated_location_for() { + console.time('generated_location_for'); + }, + end_generated_location_for() { + console.timeEnd('generated_location_for'); + }, - start_original_location_for() { console.time("original_location_for"); }, - end_original_location_for() { console.timeEnd("original_location_for"); }, + start_original_location_for() { + console.time('original_location_for'); + }, + end_original_location_for() { + console.timeEnd('original_location_for'); + }, - start_parse_mappings() { console.time("parse_mappings"); }, - end_parse_mappings() { console.timeEnd("parse_mappings"); }, + start_parse_mappings() { + console.time('parse_mappings'); + }, + end_parse_mappings() { + console.timeEnd('parse_mappings'); + }, - start_sort_by_generated_location() { console.time("sort_by_generated_location"); }, - end_sort_by_generated_location() { console.timeEnd("sort_by_generated_location"); }, + start_sort_by_generated_location() { + console.time('sort_by_generated_location'); + }, + end_sort_by_generated_location() { + console.timeEnd('sort_by_generated_location'); + }, - start_sort_by_original_location() { console.time("sort_by_original_location"); }, - end_sort_by_original_location() { console.timeEnd("sort_by_original_location"); }, - } - }); - }).then(Wasm => { - return { - exports: Wasm.instance.exports, - withMappingCallback: (mappingCallback, f) => { - callbackStack.push(mappingCallback); - try { - f(); - } finally { - callbackStack.pop(); - } + start_sort_by_original_location() { + console.time('sort_by_original_location'); + }, + end_sort_by_original_location() { + console.timeEnd('sort_by_original_location'); + }, + }, + }) + }) + .then((Wasm) => { + return { + exports: Wasm.instance.exports, + withMappingCallback: (mappingCallback, f) => { + callbackStack.push(mappingCallback); + try { + f(); + } finally { + callbackStack.pop(); + } + }, } - }; - }).then(null, e => { - cachedWasm = null; - throw e; - }); + }) + .then(null, (e) => { + cachedWasm = null; + throw e + }); - return cachedWasm; + return cachedWasm }; var binarySearch = binarySearch$1; @@ -1755,7 +1832,7 @@ const ArraySet = require$$0$1.ArraySet; -const INTERNAL = Symbol("smcInternal"); +const INTERNAL = Symbol('smcInternal'); class SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { @@ -1763,18 +1840,18 @@ class SourceMapConsumer$1 { // Yes, this is a hack to retain the pre-existing API of the base-class // constructor also being an async factory function. if (aSourceMap == INTERNAL) { - return Promise.resolve(this); + return Promise.resolve(this) } - return _factory(aSourceMap, aSourceMapURL); + return _factory(aSourceMap, aSourceMapURL) } static initialize(opts) { - readWasm.initialize(opts["lib/mappings.wasm"]); + readWasm.initialize(opts['lib/mappings.wasm']); } static fromSourceMap(aSourceMap, aSourceMapURL) { - return _factoryBSM(aSourceMap, aSourceMapURL); + return _factoryBSM(aSourceMap, aSourceMapURL) } /** @@ -1810,7 +1887,7 @@ class SourceMapConsumer$1 { static async with(rawSourceMap, sourceMapUrl, f) { const consumer = await new SourceMapConsumer$1(rawSourceMap, sourceMapUrl); try { - return await f(consumer); + return await f(consumer) } finally { consumer.destroy(); } @@ -1822,7 +1899,7 @@ class SourceMapConsumer$1 { * `this.__originalMappings` properties). */ _parseMappings(aStr, aSourceRoot) { - throw new Error("Subclasses must implement _parseMappings"); + throw new Error('Subclasses must implement _parseMappings') } /** @@ -1842,7 +1919,7 @@ class SourceMapConsumer$1 { * `SourceMapConsumer.GENERATED_ORDER`. */ eachMapping(aCallback, aContext, aOrder) { - throw new Error("Subclasses must implement eachMapping"); + throw new Error('Subclasses must implement eachMapping') } /** @@ -1868,11 +1945,11 @@ class SourceMapConsumer$1 { * The column number is 0-based. */ allGeneratedPositionsFor(aArgs) { - throw new Error("Subclasses must implement allGeneratedPositionsFor"); + throw new Error('Subclasses must implement allGeneratedPositionsFor') } destroy() { - throw new Error("Subclasses must implement destroy"); + throw new Error('Subclasses must implement destroy') } } @@ -1924,26 +2001,26 @@ var SourceMapConsumer_1 = SourceMapConsumer$1; */ class BasicSourceMapConsumer extends SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { - return super(INTERNAL).then(that => { + return super(INTERNAL).then((that) => { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const version = util.getArg(sourceMap, "version"); - let sources = util.getArg(sourceMap, "sources"); + const version = util.getArg(sourceMap, 'version'); + let sources = util.getArg(sourceMap, 'sources'); // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which // requires the array) to play nice here. - const names = util.getArg(sourceMap, "names", []); - let sourceRoot = util.getArg(sourceMap, "sourceRoot", null); - const sourcesContent = util.getArg(sourceMap, "sourcesContent", null); - const mappings = util.getArg(sourceMap, "mappings"); - const file = util.getArg(sourceMap, "file", null); + const names = util.getArg(sourceMap, 'names', []); + let sourceRoot = util.getArg(sourceMap, 'sourceRoot', null); + const sourcesContent = util.getArg(sourceMap, 'sourcesContent', null); + const mappings = util.getArg(sourceMap, 'mappings'); + const file = util.getArg(sourceMap, 'file', null); // Once again, Sass deviates from the spec and supplies the version as a // string rather than a number, so we use loose equality checking here. if (version != that._version) { - throw new Error("Unsupported version: " + version); + throw new Error('Unsupported version: ' + version) } if (sourceRoot) { @@ -1960,10 +2037,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // the source root, if the source root is absolute. Not doing this would // be particularly problematic when the source root is a prefix of the // source (valid, but why??). See github issue #199 and bugzil.la/1188982. - .map(function(source) { - return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source) + .map(function (source) { + return sourceRoot && + util.isAbsolute(sourceRoot) && + util.isAbsolute(source) ? util.relative(sourceRoot, source) - : source; + : source }); // Pass `true` below to allow duplicate names and sources. While source maps @@ -1973,8 +2052,8 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { that._names = ArraySet.fromArray(names.map(String), true); that._sources = ArraySet.fromArray(sources, true); - that._absoluteSources = that._sources.toArray().map(function(s) { - return util.computeSourceURL(sourceRoot, s, aSourceMapURL); + that._absoluteSources = that._sources.toArray().map(function (s) { + return util.computeSourceURL(sourceRoot, s, aSourceMapURL) }); that.sourceRoot = sourceRoot; @@ -1987,11 +2066,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { that._mappingsPtr = 0; that._wasm = null; - return wasm().then(w => { + return wasm().then((w) => { that._wasm = w; - return that; - }); - }); + return that + }) + }) } /** @@ -2005,18 +2084,18 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { } if (this._sources.has(relativeSource)) { - return this._sources.indexOf(relativeSource); + return this._sources.indexOf(relativeSource) } // Maybe aSource is an absolute URL as returned by |sources|. In // this case we can't simply undo the transform. for (let i = 0; i < this._absoluteSources.length; ++i) { if (this._absoluteSources[i] == aSource) { - return i; + return i } } - return -1; + return -1 } /** @@ -2029,11 +2108,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { * @returns BasicSourceMapConsumer */ static fromSourceMap(aSourceMap, aSourceMapURL) { - return new BasicSourceMapConsumer(aSourceMap.toString()); + return new BasicSourceMapConsumer(aSourceMap.toString()) } get sources() { - return this._absoluteSources.slice(); + return this._absoluteSources.slice() } _getMappingsPtr() { @@ -2041,7 +2120,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this._mappingsPtr; + return this._mappingsPtr } /** @@ -2053,7 +2132,11 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { const size = aStr.length; const mappingsBufPtr = this._wasm.exports.allocate_mappings(size); - const mappingsBuf = new Uint8Array(this._wasm.exports.memory.buffer, mappingsBufPtr, size); + const mappingsBuf = new Uint8Array( + this._wasm.exports.memory.buffer, + mappingsBufPtr, + size + ); for (let i = 0; i < size; i++) { mappingsBuf[i] = aStr.charCodeAt(i); } @@ -2067,23 +2150,24 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // XXX: keep these error codes in sync with `fitzgen/source-map-mappings`. switch (error) { case 1: - msg += "the mappings contained a negative line, column, source index, or name index"; - break; + msg += + 'the mappings contained a negative line, column, source index, or name index'; + break case 2: - msg += "the mappings contained a number larger than 2**32"; - break; + msg += 'the mappings contained a number larger than 2**32'; + break case 3: - msg += "reached EOF while in the middle of parsing a VLQ"; - break; + msg += 'reached EOF while in the middle of parsing a VLQ'; + break case 4: - msg += "invalid base 64 character while parsing a VLQ"; - break; + msg += 'invalid base 64 character while parsing a VLQ'; + break default: - msg += "unknown error code"; - break; + msg += 'unknown error code'; + break } - throw new Error(msg); + throw new Error(msg) } this._mappingsPtr = mappingsPtr; @@ -2095,10 +2179,14 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { const sourceRoot = this.sourceRoot; this._wasm.withMappingCallback( - mapping => { + (mapping) => { if (mapping.source !== null) { mapping.source = this._sources.at(mapping.source); - mapping.source = util.computeSourceURL(sourceRoot, mapping.source, this._sourceMapURL); + mapping.source = util.computeSourceURL( + sourceRoot, + mapping.source, + this._sourceMapURL + ); if (mapping.name !== null) { mapping.name = this._names.at(mapping.name); @@ -2109,41 +2197,41 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { }, () => { switch (order) { - case SourceMapConsumer$1.GENERATED_ORDER: - this._wasm.exports.by_generated_location(this._getMappingsPtr()); - break; - case SourceMapConsumer$1.ORIGINAL_ORDER: - this._wasm.exports.by_original_location(this._getMappingsPtr()); - break; - default: - throw new Error("Unknown order of iteration."); + case SourceMapConsumer$1.GENERATED_ORDER: + this._wasm.exports.by_generated_location(this._getMappingsPtr()); + break + case SourceMapConsumer$1.ORIGINAL_ORDER: + this._wasm.exports.by_original_location(this._getMappingsPtr()); + break + default: + throw new Error('Unknown order of iteration.') } } ); } allGeneratedPositionsFor(aArgs) { - let source = util.getArg(aArgs, "source"); - const originalLine = util.getArg(aArgs, "line"); + let source = util.getArg(aArgs, 'source'); + const originalLine = util.getArg(aArgs, 'line'); const originalColumn = aArgs.column || 0; source = this._findSourceIndex(source); if (source < 0) { - return []; + return [] } if (originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } const mappings = []; this._wasm.withMappingCallback( - m => { + (m) => { let lastColumn = m.lastGeneratedColumn; if (this._computedColumnSpans && lastColumn === null) { lastColumn = Infinity; @@ -2153,18 +2241,19 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { column: m.generatedColumn, lastColumn, }); - }, () => { + }, + () => { this._wasm.exports.all_generated_locations_for( this._getMappingsPtr(), source, originalLine - 1, - "column" in aArgs, + 'column' in aArgs, originalColumn ); } ); - return mappings; + return mappings } destroy() { @@ -2180,7 +2269,7 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ computeColumnSpans() { if (this._computedColumnSpans) { - return; + return } this._wasm.exports.compute_column_spans(this._getMappingsPtr()); @@ -2213,52 +2302,63 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ originalPositionFor(aArgs) { const needle = { - generatedLine: util.getArg(aArgs, "line"), - generatedColumn: util.getArg(aArgs, "column") + generatedLine: util.getArg(aArgs, 'line'), + generatedColumn: util.getArg(aArgs, 'column'), }; if (needle.generatedLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.generatedColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } - let bias = util.getArg(aArgs, "bias", SourceMapConsumer$1.GREATEST_LOWER_BOUND); + let bias = util.getArg( + aArgs, + 'bias', + SourceMapConsumer$1.GREATEST_LOWER_BOUND + ); if (bias == null) { bias = SourceMapConsumer$1.GREATEST_LOWER_BOUND; } let mapping; - this._wasm.withMappingCallback(m => mapping = m, () => { - this._wasm.exports.original_location_for( - this._getMappingsPtr(), - needle.generatedLine - 1, - needle.generatedColumn, - bias - ); - }); + this._wasm.withMappingCallback( + (m) => (mapping = m), + () => { + this._wasm.exports.original_location_for( + this._getMappingsPtr(), + needle.generatedLine - 1, + needle.generatedColumn, + bias + ); + } + ); if (mapping) { if (mapping.generatedLine === needle.generatedLine) { - let source = util.getArg(mapping, "source", null); + let source = util.getArg(mapping, 'source', null); if (source !== null) { source = this._sources.at(source); - source = util.computeSourceURL(this.sourceRoot, source, this._sourceMapURL); + source = util.computeSourceURL( + this.sourceRoot, + source, + this._sourceMapURL + ); } - let name = util.getArg(mapping, "name", null); + let name = util.getArg(mapping, 'name', null); if (name !== null) { name = this._names.at(name); } return { source, - line: util.getArg(mapping, "originalLine", null), - column: util.getArg(mapping, "originalColumn", null), - name - }; + line: util.getArg(mapping, 'originalLine', null), + column: util.getArg(mapping, 'originalColumn', null), + name, + } } } @@ -2266,8 +2366,8 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { source: null, line: null, column: null, - name: null - }; + name: null, + } } /** @@ -2276,10 +2376,14 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ hasContentsOfAllSources() { if (!this.sourcesContent) { - return false; + return false } - return this.sourcesContent.length >= this._sources.size() && - !this.sourcesContent.some(function(sc) { return sc == null; }); + return ( + this.sourcesContent.length >= this._sources.size() && + !this.sourcesContent.some(function (sc) { + return sc == null + }) + ) } /** @@ -2289,12 +2393,12 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { */ sourceContentFor(aSource, nullOnMissing) { if (!this.sourcesContent) { - return null; + return null } const index = this._findSourceIndex(aSource); if (index >= 0) { - return this.sourcesContent[index]; + return this.sourcesContent[index] } let relativeSource = aSource; @@ -2303,21 +2407,21 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { } let url; - if (this.sourceRoot != null - && (url = util.urlParse(this.sourceRoot))) { + if (this.sourceRoot != null && (url = util.urlParse(this.sourceRoot))) { // XXX: file:// URIs and absolute paths lead to unexpected behavior for // many users. We can help them out when they expect file:// URIs to // behave like it would if they were running a local HTTP server. See // https://bugzilla.mozilla.org/show_bug.cgi?id=885597. - const fileUriAbsPath = relativeSource.replace(/^file:\/\//, ""); - if (url.scheme == "file" - && this._sources.has(fileUriAbsPath)) { - return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]; + const fileUriAbsPath = relativeSource.replace(/^file:\/\//, ''); + if (url.scheme == 'file' && this._sources.has(fileUriAbsPath)) { + return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)] } - if ((!url.path || url.path == "/") - && this._sources.has("/" + relativeSource)) { - return this.sourcesContent[this._sources.indexOf("/" + relativeSource)]; + if ( + (!url.path || url.path == '/') && + this._sources.has('/' + relativeSource) + ) { + return this.sourcesContent[this._sources.indexOf('/' + relativeSource)] } } @@ -2326,10 +2430,10 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { // don't want to throw if we can't find the source - we just want to // return null, so we provide a flag to exit gracefully. if (nullOnMissing) { - return null; + return null } - throw new Error('"' + relativeSource + '" is not in the SourceMap.'); + throw new Error('"' + relativeSource + '" is not in the SourceMap.') } /** @@ -2356,45 +2460,52 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { * The column number is 0-based. */ generatedPositionFor(aArgs) { - let source = util.getArg(aArgs, "source"); + let source = util.getArg(aArgs, 'source'); source = this._findSourceIndex(source); if (source < 0) { return { line: null, column: null, - lastColumn: null - }; + lastColumn: null, + } } const needle = { source, - originalLine: util.getArg(aArgs, "line"), - originalColumn: util.getArg(aArgs, "column") + originalLine: util.getArg(aArgs, 'line'), + originalColumn: util.getArg(aArgs, 'column'), }; if (needle.originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } - let bias = util.getArg(aArgs, "bias", SourceMapConsumer$1.GREATEST_LOWER_BOUND); + let bias = util.getArg( + aArgs, + 'bias', + SourceMapConsumer$1.GREATEST_LOWER_BOUND + ); if (bias == null) { bias = SourceMapConsumer$1.GREATEST_LOWER_BOUND; } let mapping; - this._wasm.withMappingCallback(m => mapping = m, () => { - this._wasm.exports.generated_location_for( - this._getMappingsPtr(), - needle.source, - needle.originalLine - 1, - needle.originalColumn, - bias - ); - }); + this._wasm.withMappingCallback( + (m) => (mapping = m), + () => { + this._wasm.exports.generated_location_for( + this._getMappingsPtr(), + needle.source, + needle.originalLine - 1, + needle.originalColumn, + bias + ); + } + ); if (mapping) { if (mapping.source === needle.source) { @@ -2403,18 +2514,18 @@ class BasicSourceMapConsumer extends SourceMapConsumer$1 { lastColumn = Infinity; } return { - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, - }; + } } } return { line: null, column: null, - lastColumn: null - }; + lastColumn: null, + } } } @@ -2472,17 +2583,17 @@ var BasicSourceMapConsumer_1 = BasicSourceMapConsumer; */ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { constructor(aSourceMap, aSourceMapURL) { - return super(INTERNAL).then(that => { + return super(INTERNAL).then((that) => { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const version = util.getArg(sourceMap, "version"); - const sections = util.getArg(sourceMap, "sections"); + const version = util.getArg(sourceMap, 'version'); + const sections = util.getArg(sourceMap, 'sections'); if (version != that._version) { - throw new Error("Unsupported version: " + version); + throw new Error('Unsupported version: ' + version) } that._sources = new ArraySet(); @@ -2494,41 +2605,52 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { let lastOffset = { line: -1, - column: 0 + column: 0, }; - return Promise.all(sections.map(s => { - if (s.url) { - // The url field will require support for asynchronicity. - // See https://github.com/mozilla/source-map/issues/16 - throw new Error("Support for url field in sections not implemented."); - } - const offset = util.getArg(s, "offset"); - const offsetLine = util.getArg(offset, "line"); - const offsetColumn = util.getArg(offset, "column"); + return Promise.all( + sections.map((s) => { + if (s.url) { + // The url field will require support for asynchronicity. + // See https://github.com/mozilla/source-map/issues/16 + throw new Error( + 'Support for url field in sections not implemented.' + ) + } + const offset = util.getArg(s, 'offset'); + const offsetLine = util.getArg(offset, 'line'); + const offsetColumn = util.getArg(offset, 'column'); - if (offsetLine < lastOffset.line || - (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) { - throw new Error("Section offsets must be ordered and non-overlapping."); - } - lastOffset = offset; - - const cons = new SourceMapConsumer$1(util.getArg(s, "map"), aSourceMapURL); - return cons.then(consumer => { - return { - generatedOffset: { - // The offset fields are 0-based, but we use 1-based indices when - // encoding/decoding from VLQ. - generatedLine: offsetLine + 1, - generatedColumn: offsetColumn + 1 - }, - consumer - }; - }); - })).then(s => { + if ( + offsetLine < lastOffset.line || + (offsetLine === lastOffset.line && offsetColumn < lastOffset.column) + ) { + throw new Error( + 'Section offsets must be ordered and non-overlapping.' + ) + } + lastOffset = offset; + + const cons = new SourceMapConsumer$1( + util.getArg(s, 'map'), + aSourceMapURL + ); + return cons.then((consumer) => { + return { + generatedOffset: { + // The offset fields are 0-based, but we use 1-based indices when + // encoding/decoding from VLQ. + generatedLine: offsetLine + 1, + generatedColumn: offsetColumn + 1, + }, + consumer, + } + }) + }) + ).then((s) => { that._sections = s; - return that; - }); - }); + return that + }) + }) } // `__generatedMappings` and `__originalMappings` are arrays that hold the @@ -2565,7 +2687,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._sortGeneratedMappings(); } - return this.__generatedMappings; + return this.__generatedMappings } get _originalMappings() { @@ -2573,7 +2695,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._sortOriginalMappings(); } - return this.__originalMappings; + return this.__originalMappings } get _generatedMappingsUnsorted() { @@ -2581,7 +2703,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this.__generatedMappingsUnsorted; + return this.__generatedMappingsUnsorted } get _originalMappingsUnsorted() { @@ -2589,7 +2711,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { this._parseMappings(this._mappings, this.sourceRoot); } - return this.__originalMappingsUnsorted; + return this.__originalMappingsUnsorted } _sortGeneratedMappings() { @@ -2614,7 +2736,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { sources.push(this._sections[i].consumer.sources[j]); } } - return sources; + return sources } /** @@ -2638,22 +2760,25 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { */ originalPositionFor(aArgs) { const needle = { - generatedLine: util.getArg(aArgs, "line"), - generatedColumn: util.getArg(aArgs, "column") + generatedLine: util.getArg(aArgs, 'line'), + generatedColumn: util.getArg(aArgs, 'column'), }; // Find the section containing the generated position we're trying to map // to an original position. - const sectionIndex = binarySearch.search(needle, this._sections, - function(aNeedle, section) { - const cmp = aNeedle.generatedLine - section.generatedOffset.generatedLine; + const sectionIndex = binarySearch.search( + needle, + this._sections, + function (aNeedle, section) { + const cmp = + aNeedle.generatedLine - section.generatedOffset.generatedLine; if (cmp) { - return cmp; + return cmp } - return (aNeedle.generatedColumn - - section.generatedOffset.generatedColumn); - }); + return aNeedle.generatedColumn - section.generatedOffset.generatedColumn + } + ); const section = this._sections[sectionIndex]; if (!section) { @@ -2661,19 +2786,19 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { source: null, line: null, column: null, - name: null - }; + name: null, + } } return section.consumer.originalPositionFor({ - line: needle.generatedLine - - (section.generatedOffset.generatedLine - 1), - column: needle.generatedColumn - + line: needle.generatedLine - (section.generatedOffset.generatedLine - 1), + column: + needle.generatedColumn - (section.generatedOffset.generatedLine === needle.generatedLine - ? section.generatedOffset.generatedColumn - 1 - : 0), - bias: aArgs.bias - }); + ? section.generatedOffset.generatedColumn - 1 + : 0), + bias: aArgs.bias, + }) } /** @@ -2681,9 +2806,9 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { * map, false otherwise. */ hasContentsOfAllSources() { - return this._sections.every(function(s) { - return s.consumer.hasContentsOfAllSources(); - }); + return this._sections.every(function (s) { + return s.consumer.hasContentsOfAllSources() + }) } /** @@ -2697,13 +2822,13 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { const content = section.consumer.sourceContentFor(aSource, true); if (content) { - return content; + return content } } if (nullOnMissing) { - return null; + return null } - throw new Error('"' + aSource + '" is not in the SourceMap.'); + throw new Error('"' + aSource + '" is not in the SourceMap.') } /** @@ -2730,27 +2855,31 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // Only consider this section if the requested source is in the list of // sources of the consumer. - if (section.consumer._findSourceIndex(util.getArg(aArgs, "source")) === -1) { - continue; + if ( + section.consumer._findSourceIndex(util.getArg(aArgs, 'source')) === -1 + ) { + continue } const generatedPosition = section.consumer.generatedPositionFor(aArgs); if (generatedPosition) { const ret = { - line: generatedPosition.line + + line: + generatedPosition.line + (section.generatedOffset.generatedLine - 1), - column: generatedPosition.column + + column: + generatedPosition.column + (section.generatedOffset.generatedLine === generatedPosition.line - ? section.generatedOffset.generatedColumn - 1 - : 0) + ? section.generatedOffset.generatedColumn - 1 + : 0), }; - return ret; + return ret } } return { line: null, - column: null - }; + column: null, + } } /** @@ -2759,13 +2888,13 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { * `this.__originalMappings` properties). */ _parseMappings(aStr, aSourceRoot) { - const generatedMappings = this.__generatedMappingsUnsorted = []; - const originalMappings = this.__originalMappingsUnsorted = []; + const generatedMappings = (this.__generatedMappingsUnsorted = []); + const originalMappings = (this.__originalMappingsUnsorted = []); for (let i = 0; i < this._sections.length; i++) { const section = this._sections[i]; const sectionMappings = []; - section.consumer.eachMapping(m => sectionMappings.push(m)); + section.consumer.eachMapping((m) => sectionMappings.push(m)); for (let j = 0; j < sectionMappings.length; j++) { const mapping = sectionMappings[j]; @@ -2774,7 +2903,11 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // `source`, which would actually have gotten used as null because // var's get hoisted. // See: https://github.com/mozilla/source-map/issues/333 - let source = util.computeSourceURL(section.consumer.sourceRoot, null, this._sourceMapURL); + let source = util.computeSourceURL( + section.consumer.sourceRoot, + null, + this._sourceMapURL + ); this._sources.add(source); source = this._sources.indexOf(source); @@ -2790,19 +2923,20 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // generated file. const adjustedMapping = { source, - generatedLine: mapping.generatedLine + - (section.generatedOffset.generatedLine - 1), - generatedColumn: mapping.generatedColumn + + generatedLine: + mapping.generatedLine + (section.generatedOffset.generatedLine - 1), + generatedColumn: + mapping.generatedColumn + (section.generatedOffset.generatedLine === mapping.generatedLine - ? section.generatedOffset.generatedColumn - 1 - : 0), + ? section.generatedOffset.generatedColumn - 1 + : 0), originalLine: mapping.originalLine, originalColumn: mapping.originalColumn, - name + name, }; generatedMappings.push(adjustedMapping); - if (typeof adjustedMapping.originalLine === "number") { + if (typeof adjustedMapping.originalLine === 'number') { originalMappings.push(adjustedMapping); } } @@ -2815,91 +2949,96 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { let mappings; switch (order) { - case SourceMapConsumer$1.GENERATED_ORDER: - mappings = this._generatedMappings; - break; - case SourceMapConsumer$1.ORIGINAL_ORDER: - mappings = this._originalMappings; - break; - default: - throw new Error("Unknown order of iteration."); + case SourceMapConsumer$1.GENERATED_ORDER: + mappings = this._generatedMappings; + break + case SourceMapConsumer$1.ORIGINAL_ORDER: + mappings = this._originalMappings; + break + default: + throw new Error('Unknown order of iteration.') } const sourceRoot = this.sourceRoot; - mappings.map(function(mapping) { - let source = null; - if (mapping.source !== null) { - source = this._sources.at(mapping.source); - source = util.computeSourceURL(sourceRoot, source, this._sourceMapURL); - } - return { - source, - generatedLine: mapping.generatedLine, - generatedColumn: mapping.generatedColumn, - originalLine: mapping.originalLine, - originalColumn: mapping.originalColumn, - name: mapping.name === null ? null : this._names.at(mapping.name) - }; - }, this).forEach(aCallback, context); + mappings + .map(function (mapping) { + let source = null; + if (mapping.source !== null) { + source = this._sources.at(mapping.source); + source = util.computeSourceURL(sourceRoot, source, this._sourceMapURL); + } + return { + source, + generatedLine: mapping.generatedLine, + generatedColumn: mapping.generatedColumn, + originalLine: mapping.originalLine, + originalColumn: mapping.originalColumn, + name: mapping.name === null ? null : this._names.at(mapping.name), + } + }, this) + .forEach(aCallback, context); } /** * Find the mapping that best matches the hypothetical "needle" mapping that * we are searching for in the given "haystack" of mappings. */ - _findMapping(aNeedle, aMappings, aLineName, - aColumnName, aComparator, aBias) { + _findMapping(aNeedle, aMappings, aLineName, aColumnName, aComparator, aBias) { // To return the position we are searching for, we must first find the // mapping for the given position and then return the opposite position it // points to. Because the mappings are sorted, we can use binary search to // find the best mapping. if (aNeedle[aLineName] <= 0) { - throw new TypeError("Line must be greater than or equal to 1, got " - + aNeedle[aLineName]); + throw new TypeError( + 'Line must be greater than or equal to 1, got ' + aNeedle[aLineName] + ) } if (aNeedle[aColumnName] < 0) { - throw new TypeError("Column must be greater than or equal to 0, got " - + aNeedle[aColumnName]); + throw new TypeError( + 'Column must be greater than or equal to 0, got ' + aNeedle[aColumnName] + ) } - return binarySearch.search(aNeedle, aMappings, aComparator, aBias); + return binarySearch.search(aNeedle, aMappings, aComparator, aBias) } allGeneratedPositionsFor(aArgs) { - const line = util.getArg(aArgs, "line"); + const line = util.getArg(aArgs, 'line'); // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping // returns the index of the closest mapping less than the needle. By // setting needle.originalColumn to 0, we thus find the last mapping for // the given line, provided such a mapping exists. const needle = { - source: util.getArg(aArgs, "source"), + source: util.getArg(aArgs, 'source'), originalLine: line, - originalColumn: util.getArg(aArgs, "column", 0) + originalColumn: util.getArg(aArgs, 'column', 0), }; needle.source = this._findSourceIndex(needle.source); if (needle.source < 0) { - return []; + return [] } if (needle.originalLine < 1) { - throw new Error("Line numbers must be >= 1"); + throw new Error('Line numbers must be >= 1') } if (needle.originalColumn < 0) { - throw new Error("Column numbers must be >= 0"); + throw new Error('Column numbers must be >= 0') } const mappings = []; - let index = this._findMapping(needle, - this._originalMappings, - "originalLine", - "originalColumn", - util.compareByOriginalPositions, - binarySearch.LEAST_UPPER_BOUND); + let index = this._findMapping( + needle, + this._originalMappings, + 'originalLine', + 'originalColumn', + util.compareByOriginalPositions, + binarySearch.LEAST_UPPER_BOUND + ); if (index >= 0) { let mapping = this._originalMappings[index]; @@ -2916,8 +3055,8 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { lastColumn = Infinity; } mappings.push({ - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, }); @@ -2930,16 +3069,18 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { // a mapping for a different line than the one we were searching for. // Since mappings are sorted, this is guaranteed to find all mappings for // the line we are searching for. - while (mapping && - mapping.originalLine === line && - mapping.originalColumn == originalColumn) { + while ( + mapping && + mapping.originalLine === line && + mapping.originalColumn == originalColumn + ) { let lastColumn = mapping.lastGeneratedColumn; if (this._computedColumnSpans && lastColumn === null) { lastColumn = Infinity; } mappings.push({ - line: util.getArg(mapping, "generatedLine", null), - column: util.getArg(mapping, "generatedColumn", null), + line: util.getArg(mapping, 'generatedLine', null), + column: util.getArg(mapping, 'generatedColumn', null), lastColumn, }); @@ -2948,7 +3089,7 @@ class IndexedSourceMapConsumer extends SourceMapConsumer$1 { } } - return mappings; + return mappings } destroy() { @@ -2965,18 +3106,19 @@ var IndexedSourceMapConsumer_1 = IndexedSourceMapConsumer; */ function _factory(aSourceMap, aSourceMapURL) { let sourceMap = aSourceMap; - if (typeof aSourceMap === "string") { + if (typeof aSourceMap === 'string') { sourceMap = util.parseSourceMapInput(aSourceMap); } - const consumer = sourceMap.sections != null + const consumer = + sourceMap.sections != null ? new IndexedSourceMapConsumer(sourceMap, aSourceMapURL) : new BasicSourceMapConsumer(sourceMap, aSourceMapURL); - return Promise.resolve(consumer); + return Promise.resolve(consumer) } function _factoryBSM(aSourceMap, aSourceMapURL) { - return BasicSourceMapConsumer.fromSourceMap(aSourceMap, aSourceMapURL); + return BasicSourceMapConsumer.fromSourceMap(aSourceMap, aSourceMapURL) } var sourceMapConsumer = { @@ -3008,7 +3150,7 @@ const NEWLINE_CODE = 10; // Private symbol for identifying `SourceNode`s when multiple versions of // the source-map library are loaded. This MUST NOT CHANGE across // versions! -const isSourceNode = "$$$isSourceNode$$$"; +const isSourceNode = '$$$isSourceNode$$$'; /** * SourceNodes provide a way to abstract over interpolating/concatenating @@ -3042,7 +3184,11 @@ class SourceNode { * @param aRelativePath Optional. The path that relative sources in the * SourceMapConsumer should be relative to. */ - static fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) { + static fromStringWithSourceMap( + aGeneratedCode, + aSourceMapConsumer, + aRelativePath + ) { // The SourceNode we want to fill with the generated code // and the SourceMap const node = new SourceNode(); @@ -3053,20 +3199,22 @@ class SourceNode { // Processed fragments are accessed by calling `shiftNextLine`. const remainingLines = aGeneratedCode.split(REGEX_NEWLINE); let remainingLinesIndex = 0; - const shiftNextLine = function() { + const shiftNextLine = function () { const lineContents = getNextLine(); // The last line of a file might not have a newline. - const newLine = getNextLine() || ""; - return lineContents + newLine; + const newLine = getNextLine() || ''; + return lineContents + newLine function getNextLine() { - return remainingLinesIndex < remainingLines.length ? - remainingLines[remainingLinesIndex++] : undefined; + return remainingLinesIndex < remainingLines.length + ? remainingLines[remainingLinesIndex++] + : undefined } }; // We need to remember the position of "remainingLines" - let lastGeneratedLine = 1, lastGeneratedColumn = 0; + let lastGeneratedLine = 1, + lastGeneratedColumn = 0; // The generate SourceNodes we need a code range. // To extract it current and last mapping is used. @@ -3074,7 +3222,7 @@ class SourceNode { let lastMapping = null; let nextLine; - aSourceMapConsumer.eachMapping(function(mapping) { + aSourceMapConsumer.eachMapping(function (mapping) { if (lastMapping !== null) { // We add the code from "lastMapping" to "mapping": // First check if there is a new line in between. @@ -3088,16 +3236,19 @@ class SourceNode { // There is no new line in between. // Associate the code between "lastGeneratedColumn" and // "mapping.generatedColumn" with "lastMapping" - nextLine = remainingLines[remainingLinesIndex] || ""; - const code = nextLine.substr(0, mapping.generatedColumn - - lastGeneratedColumn); - remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn - - lastGeneratedColumn); + nextLine = remainingLines[remainingLinesIndex] || ''; + const code = nextLine.substr( + 0, + mapping.generatedColumn - lastGeneratedColumn + ); + remainingLines[remainingLinesIndex] = nextLine.substr( + mapping.generatedColumn - lastGeneratedColumn + ); lastGeneratedColumn = mapping.generatedColumn; addMappingWithCode(lastMapping, code); // No more remaining code, continue lastMapping = mapping; - return; + return } } // We add the generated code until the first mapping @@ -3108,9 +3259,11 @@ class SourceNode { lastGeneratedLine++; } if (lastGeneratedColumn < mapping.generatedColumn) { - nextLine = remainingLines[remainingLinesIndex] || ""; + nextLine = remainingLines[remainingLinesIndex] || ''; node.add(nextLine.substr(0, mapping.generatedColumn)); - remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn); + remainingLines[remainingLinesIndex] = nextLine.substr( + mapping.generatedColumn + ); lastGeneratedColumn = mapping.generatedColumn; } lastMapping = mapping; @@ -3122,11 +3275,11 @@ class SourceNode { addMappingWithCode(lastMapping, shiftNextLine()); } // and add the remaining lines without any mapping - node.add(remainingLines.splice(remainingLinesIndex).join("")); + node.add(remainingLines.splice(remainingLinesIndex).join('')); } // Copy sourcesContent into SourceNode - aSourceMapConsumer.sources.forEach(function(sourceFile) { + aSourceMapConsumer.sources.forEach(function (sourceFile) { const content = aSourceMapConsumer.sourceContentFor(sourceFile); if (content != null) { if (aRelativePath != null) { @@ -3136,7 +3289,7 @@ class SourceNode { } }); - return node; + return node function addMappingWithCode(mapping, code) { if (mapping === null || mapping.source === undefined) { @@ -3145,11 +3298,15 @@ class SourceNode { const source = aRelativePath ? util.join(aRelativePath, mapping.source) : mapping.source; - node.add(new SourceNode(mapping.originalLine, - mapping.originalColumn, - source, - code, - mapping.name)); + node.add( + new SourceNode( + mapping.originalLine, + mapping.originalColumn, + source, + code, + mapping.name + ) + ); } } } @@ -3162,19 +3319,20 @@ class SourceNode { */ add(aChunk) { if (Array.isArray(aChunk)) { - aChunk.forEach(function(chunk) { + aChunk.forEach(function (chunk) { this.add(chunk); }, this); - } else if (aChunk[isSourceNode] || typeof aChunk === "string") { + } else if (aChunk[isSourceNode] || typeof aChunk === 'string') { if (aChunk) { this.children.push(aChunk); } } else { throw new TypeError( - "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk - ); + 'Expected a SourceNode, string, or an array of SourceNodes and strings. Got ' + + aChunk + ) } - return this; + return this } /** @@ -3188,14 +3346,15 @@ class SourceNode { for (let i = aChunk.length - 1; i >= 0; i--) { this.prepend(aChunk[i]); } - } else if (aChunk[isSourceNode] || typeof aChunk === "string") { + } else if (aChunk[isSourceNode] || typeof aChunk === 'string') { this.children.unshift(aChunk); } else { throw new TypeError( - "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk - ); + 'Expected a SourceNode, string, or an array of SourceNodes and strings. Got ' + + aChunk + ) } - return this; + return this } /** @@ -3211,11 +3370,13 @@ class SourceNode { chunk = this.children[i]; if (chunk[isSourceNode]) { chunk.walk(aFn); - } else if (chunk !== "") { - aFn(chunk, { source: this.source, - line: this.line, - column: this.column, - name: this.name }); + } else if (chunk !== '') { + aFn(chunk, { + source: this.source, + line: this.line, + column: this.column, + name: this.name, + }); } } } @@ -3239,7 +3400,7 @@ class SourceNode { newChildren.push(this.children[i]); this.children = newChildren; } - return this; + return this } /** @@ -3253,12 +3414,15 @@ class SourceNode { const lastChild = this.children[this.children.length - 1]; if (lastChild[isSourceNode]) { lastChild.replaceRight(aPattern, aReplacement); - } else if (typeof lastChild === "string") { - this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement); + } else if (typeof lastChild === 'string') { + this.children[this.children.length - 1] = lastChild.replace( + aPattern, + aReplacement + ); } else { - this.children.push("".replace(aPattern, aReplacement)); + this.children.push(''.replace(aPattern, aReplacement)); } - return this; + return this } /** @@ -3296,11 +3460,11 @@ class SourceNode { * and concatenates all the various snippets together to one string. */ toString() { - let str = ""; - this.walk(function(chunk) { + let str = ''; + this.walk(function (chunk) { str += chunk; }); - return str; + return str } /** @@ -3309,9 +3473,9 @@ class SourceNode { */ toStringWithSourceMap(aArgs) { const generated = { - code: "", + code: '', line: 1, - column: 0 + column: 0, }; const map = new SourceMapGenerator(aArgs); let sourceMappingActive = false; @@ -3319,26 +3483,30 @@ class SourceNode { let lastOriginalLine = null; let lastOriginalColumn = null; let lastOriginalName = null; - this.walk(function(chunk, original) { + this.walk(function (chunk, original) { generated.code += chunk; - if (original.source !== null - && original.line !== null - && original.column !== null) { - if (lastOriginalSource !== original.source - || lastOriginalLine !== original.line - || lastOriginalColumn !== original.column - || lastOriginalName !== original.name) { + if ( + original.source !== null && + original.line !== null && + original.column !== null + ) { + if ( + lastOriginalSource !== original.source || + lastOriginalLine !== original.line || + lastOriginalColumn !== original.column || + lastOriginalName !== original.name + ) { map.addMapping({ source: original.source, original: { line: original.line, - column: original.column + column: original.column, }, generated: { line: generated.line, - column: generated.column + column: generated.column, }, - name: original.name + name: original.name, }); } lastOriginalSource = original.source; @@ -3350,8 +3518,8 @@ class SourceNode { map.addMapping({ generated: { line: generated.line, - column: generated.column - } + column: generated.column, + }, }); lastOriginalSource = null; sourceMappingActive = false; @@ -3369,13 +3537,13 @@ class SourceNode { source: original.source, original: { line: original.line, - column: original.column + column: original.column, }, generated: { line: generated.line, - column: generated.column + column: generated.column, }, - name: original.name + name: original.name, }); } } else { @@ -3383,11 +3551,11 @@ class SourceNode { } } }); - this.walkSourceContents(function(sourceFile, sourceContent) { + this.walkSourceContents(function (sourceFile, sourceContent) { map.setSourceContent(sourceFile, sourceContent); }); - return { code: generated.code, map }; + return { code: generated.code, map } } } @@ -3408,7 +3576,8 @@ var require$$2 = sourceNode; */ require$$0.SourceMapGenerator; -var SourceMapConsumer = require$$1.SourceMapConsumer; +var SourceMapConsumer = + require$$1.SourceMapConsumer; require$$2.SourceNode; // @ts-ignore diff --git a/packages/uni-uts-vite/__tests__/module.spec.ts b/packages/uni-uts-vite/__tests__/module.spec.ts deleted file mode 100644 index 8590aa08aa20a4ba1c0831d9e08c6c3e48c3f76f..0000000000000000000000000000000000000000 --- a/packages/uni-uts-vite/__tests__/module.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { normalizeArg, initModule } from '../module' - -describe('uts-module', () => { - test('normalize args', () => { - expect(normalizeArg(1)).toBe(1) - expect(normalizeArg('hello')).toBe('hello') - expect(normalizeArg(true)).toBe(true) - expect(normalizeArg({ callback: () => {} })).toEqual({ - callback: 1, - }) - expect( - normalizeArg({ success: () => {}, fail: () => {}, complete: () => {} }) - ).toEqual({ - success: 2, - fail: 3, - complete: 4, - }) - expect( - normalizeArg({ - user: { - name: 'test', - age: 10, - callback() {}, - }, - success() {}, - }) - ).toEqual({ - user: { - name: 'test', - age: 10, - callback: 5, - }, - success: 6, - }) - }) - test(`invoke`, () => { - const wifi = initModule('wifi', { - preparePermission: { async: true }, - }) - /** - * {"module":"wifi","method":"preparePermission","params":[{"name":"foo","age":10,"success":7,"fail":8},9]} - */ - wifi.preparePermission( - { - name: 'foo', - age: 10, - success(res: any) { - console.log('success', res) - }, - fail(res: any) { - console.log('fail', res) - }, - }, - (res: any) => { - console.log('callback', res) - } - ) - }) -}) diff --git a/packages/uni-uts-vite/build.json b/packages/uni-uts-vite/build.json deleted file mode 100644 index 2c89cf8cd38f19b8c52320a2abee2fb39df1ea64..0000000000000000000000000000000000000000 --- a/packages/uni-uts-vite/build.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "input": { - "module.ts": "lib/module.js" - }, - "treeshake": false, - "compilerOptions": { - "module": "ESNext" - } - } -] diff --git a/packages/uni-uts-vite/lib/module.js b/packages/uni-uts-vite/lib/module.js deleted file mode 100644 index e559a3edb8fc1143e99f6ec09e5dcd1ae223d157..0000000000000000000000000000000000000000 --- a/packages/uni-uts-vite/lib/module.js +++ /dev/null @@ -1,80 +0,0 @@ -const moduleName = '__MODULE_NAME__'; -const moduleDefine = '__MODULE_DEFINE__'; -var module = initModule(moduleName, moduleDefine); -let callbackId = 1; -const objectToString = Object.prototype.toString; -const toTypeString = (value) => objectToString.call(value); -const isPlainObject = (val) => toTypeString(val) === '[object Object]'; -const callbacks = {}; -function normalizeArg(arg) { - if (typeof arg === 'function') { - const id = callbackId++; - callbacks[id] = arg; - return id; - } - else if (isPlainObject(arg)) { - Object.keys(arg).forEach((name) => { - ; - arg[name] = normalizeArg(arg[name]); - }); - } - return arg; -} -function isProxyInvokeCallbackResponse(res) { - return !!res.name; -} -function moduleGetter(proxy, module, method, defines) { - const invokeCallback = ({ id, name, params, keepAlive, }) => { - const callback = callbacks[id]; - if (callback) { - callback(...params); - if (!keepAlive) { - delete callbacks[id]; - } - } - else { - console.error(`${module}.${method} ${name} is not found`); - } - }; - return (...args) => { - const params = args.map((arg) => normalizeArg(arg)); - const invokeArgs = { module, method, params, async: !!defines.async }; - if (defines.async) { - return new Promise((resolve, reject) => { - proxy.invoke(invokeArgs, (res) => { - if (isProxyInvokeCallbackResponse(res)) { - invokeCallback(res); - } - else { - if (res.errMsg) { - reject(res.errMsg); - } - else { - resolve(res.params); - } - } - }); - }); - } - return proxy.invoke(invokeArgs, invokeCallback); - }; -} -function initModule(name, defines, proxyModuleName = 'ProxyModule') { - let proxy; - const moduleProxy = {}; - for (const method in moduleDefine) { - Object.defineProperty(moduleProxy, method, { - enumerable: true, - configurable: true, - get: () => { - if (!proxy) { - proxy = uni.requireNativePlugin(proxyModuleName); - } - return moduleGetter(proxy, name, method, defines[method]); - }, - }); - } - return moduleProxy; -} - -export { module as default, initModule, normalizeArg }; diff --git a/packages/uni-uts-vite/src/plugins/v1.ts b/packages/uni-uts-vite/src/plugins/v1.ts index 8d838f1f20a8073398ef86c15f8f70f5d1950aff..b781f8f769f4bf4461018f3065196da1d88fe8ab 100644 --- a/packages/uni-uts-vite/src/plugins/v1.ts +++ b/packages/uni-uts-vite/src/plugins/v1.ts @@ -1,21 +1,37 @@ import type { Plugin } from 'vite' -import fs from 'fs' import path from 'path' -import { normalizePath, parseVueRequest } from '@dcloudio/uni-cli-shared' +import { camelize } from '@vue/shared' import { - ExportDefaultDeclaration, + normalizePath, + parseVueRequest, + requireResolve, +} from '@dcloudio/uni-cli-shared' +import { + ClassDeclaration, + FunctionDeclaration, Module, TsFunctionType, + TsInterfaceDeclaration, TsType, + TsTypeAliasDeclaration, TsTypeAnnotation, } from '../../types/types' -// 需要区分 android，iOS + export function uniUtsV1Plugin(): Plugin { - let moduleCode: string + // 目前仅支持 app-android + process.env.UNI_APP_PLATFORM = 'app-android' return { name: 'uni:uts-v1', apply: 'build', enforce: 'pre', + resolveId(id, importer) { + if (isUtsModuleRoot(id)) { + return requireResolve( + id, + (importer && path.dirname(importer)) || process.env.UNI_INPUT_DIR + ) + } + }, async transform(code, id, opts) { if (opts && opts.ssr) { return @@ -24,23 +40,19 @@ export function uniUtsV1Plugin(): Plugin { if (path.extname(filename) !== '.uts') { return } - const moduleName = parseModuleId(filename) - if (!moduleName) { + const pkg = parsePackage(filename) + if (!pkg) { return } // 懒加载 uts 编译器 // eslint-disable-next-line no-restricted-globals const { parse } = require('@dcloudio/uts') const ast = await parse(code) - if (!moduleCode) { - moduleCode = fs.readFileSync( - path.resolve(__dirname, '../../lib/module.js'), - 'utf8' - ) - } - code = moduleCode - .replace(`__MODULE_NAME__`, moduleName) - .replace(`'__MODULE_DEFINE__'`, JSON.stringify(parseModuleDefines(ast))) + code = ` +import { initUtsProxyClass, initUtsProxyFunction } from '@dcloudio/uni-app' +const pkg = '${pkg}' +${genProxyCode(ast)} +` // TODO compile uts return code @@ -48,59 +60,147 @@ export function uniUtsV1Plugin(): Plugin { } } -function parseModuleId(filepath: string) { +// 仅限 uni_modules/test-plugin 格式 +function isUtsModuleRoot(id: string) { + const parts = normalizePath(id).split('/') + if (parts[parts.length - 2] === 'uni_modules') { + return true + } + return false +} + +function parsePackage(filepath: string) { const parts = normalizePath(filepath).split('/') const index = parts.findIndex((part) => part === 'uni_modules') if (index > -1) { - return parts[index + 1] + return camelize(parts[index + 1]) } return '' } -function parseModuleDefines(ast: Module) { - const module: Record = {} - const defaultDecl = ast.body.find( - (item) => item.type === 'ExportDefaultDeclaration' - ) as ExportDefaultDeclaration - if (!defaultDecl || defaultDecl.decl.type !== 'TsInterfaceDeclaration') { - return 'only support `export default interface Module {}`' +function genProxyFunctionCode( + method: string, + async: boolean, + isDefault: boolean = false +) { + if (isDefault) { + return `export default initUtsProxyFunction({ pkg, cls: '', method: '${method}', async: ${async} })` } - const body = defaultDecl.decl.body.body - body.forEach((item) => { - if (item.type === 'TsPropertySignature') { - const { key, typeAnnotation } = item - if (key.type !== 'Identifier') { - return - } - if (!typeAnnotation) { - return - } - const functionType = typeAnnotation.typeAnnotation - if (!isFunctionType(functionType)) { - return + return `export const ${method} = initUtsProxyFunction({ pkg, cls: '', method: '${method}', async: ${async} })` +} + +function genProxyClassCode( + cls: string, + methods: Record, + isDefault: boolean = false +) { + if (isDefault) { + return `export default initUtsProxyClass({ pkg, cls: '${cls}', methods: ${JSON.stringify( + methods + )} })` + } + return `export const ${cls} = initUtsProxyClass({ pkg, cls: '${cls}', methods: ${JSON.stringify( + methods + )} })` +} + +function genTsTypeAliasDeclarationCode(decl: TsTypeAliasDeclaration) { + if (isFunctionType(decl.typeAnnotation)) { + return genProxyFunctionCode( + decl.id.value, + isReturnPromise(decl.typeAnnotation.typeAnnotation) + ) + } +} +function genTsInterfaceDeclarationCode( + decl: TsInterfaceDeclaration, + isDefault: boolean = false +) { + const cls = decl.id.value + const methods: Record = {} + decl.body.body.forEach((item) => { + if (item.type === 'TsMethodSignature') { + if (item.key.type === 'Identifier') { + methods[item.key.value] = { + async: isReturnPromise(item.typeAnn), + } } - const methodName = key.value - module[methodName] = { - async: isReturnPromise(functionType.typeAnnotation), + } + }) + return genProxyClassCode(cls, methods, isDefault) +} + +function genFunctionDeclarationCode( + decl: FunctionDeclaration, + isDefault: boolean = false +) { + return genProxyFunctionCode( + decl.identifier.value, + decl.async || isReturnPromise(decl.returnType), + isDefault + ) +} + +function genClassDeclarationCode( + decl: ClassDeclaration, + isDefault: boolean = false +) { + const cls = decl.identifier.value + const methods: Record = {} + decl.body.forEach((item) => { + if (item.type === 'ClassMethod') { + if (item.key.type === 'Identifier') { + methods[item.key.value] = { + async: + item.function.async || isReturnPromise(item.function.returnType), + } } - } else if (item.type === 'TsMethodSignature') { - if (item.key.type !== 'Identifier') { - return + } + }) + return genProxyClassCode(cls, methods, isDefault) +} + +function genProxyCode({ body }: Module) { + const codes: string[] = [] + body.forEach((item) => { + let code: string | undefined + if (item.type === 'ExportDeclaration') { + const decl = item.declaration + switch (decl.type) { + case 'FunctionDeclaration': + code = genFunctionDeclarationCode(decl, false) + break + case 'ClassDeclaration': + code = genClassDeclarationCode(decl, false) + break + case 'TsTypeAliasDeclaration': + code = genTsTypeAliasDeclarationCode(decl) + break + case 'TsInterfaceDeclaration': + code = genTsInterfaceDeclarationCode(decl, false) + break } - const methodName = item.key.value - module[methodName] = { - async: item.typeAnn ? isReturnPromise(item.typeAnn) : false, + } else if (item.type === 'ExportDefaultDeclaration') { + if (item.decl.type === 'TsInterfaceDeclaration') { + code = genTsInterfaceDeclarationCode(item.decl, true) } } + if (code) { + codes.push(code) + } }) - return module + return codes.join(`\n`) } function isFunctionType(type: TsType): type is TsFunctionType { return type.type === 'TsFunctionType' } -function isReturnPromise({ typeAnnotation }: TsTypeAnnotation) { +function isReturnPromise(anno?: TsTypeAnnotation) { + if (!anno) { + return false + } + const { typeAnnotation } = anno return ( typeAnnotation.type === 'TsTypeReference' && typeAnnotation.typeName.type === 'Identifier' && diff --git a/packages/uts-darwin-arm64/uts.darwin-arm64.node b/packages/uts-darwin-arm64/uts.darwin-arm64.node index e467eb5fe50a9c44ac00bfe4995daa9ceba8319f..79e2cb589e7560292c62b0f0fdb0d7d9c635be35 100755 Binary files a/packages/uts-darwin-arm64/uts.darwin-arm64.node and b/packages/uts-darwin-arm64/uts.darwin-arm64.node differ diff --git a/packages/uts-darwin-x64/uts.darwin-x64.node b/packages/uts-darwin-x64/uts.darwin-x64.node index afee7517b5fcd3b8780cdca711dc5beafb2cd99e..4349bcf4e4765b66bc33c38f1f420b50aa5e667f 100755 Binary files a/packages/uts-darwin-x64/uts.darwin-x64.node and b/packages/uts-darwin-x64/uts.darwin-x64.node differ diff --git a/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node b/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node index 4964478c2703d68fc8bfb4411d3e339ac66fa58c..8dea3cf7bcc07d04b8ee195cf2cacc5594df5105 100644 Binary files a/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node and b/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node differ diff --git a/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node b/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node index 7bef98cbbbc52173b053816c7cfd701726b89b9e..349b42ced17d81776704b8514a5e441279f8f8a4 100644 Binary files a/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node and b/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node differ diff --git a/packages/uts/src/api.ts b/packages/uts/src/api.ts index 25af780ebffc4f2e6948cebe177ba4e9f386bb83..49d349ac69793eba332b69a9d58b127c16b24329 100644 --- a/packages/uts/src/api.ts +++ b/packages/uts/src/api.ts @@ -1,5 +1,10 @@ import { resolve } from 'path' -import type { UtsOptions, UtsParseOptions, UtsResult } from './types' +import type { + UtsBundleOptions, + UtsOptions, + UtsParseOptions, + UtsResult, +} from './types' import { normalizePath } from './utils' const bindingsOverride = process.env['UTS_BINARY_PATH'] @@ -65,6 +70,10 @@ export function toSwift(options: UtsOptions): Promise { .then((res: string) => JSON.parse(res)) } +export function bundle(options: UtsBundleOptions): Promise { + return bindings.bundle(toBuffer(options)).then((res: string) => res) +} + function toBuffer(t: any): Buffer { return Buffer.from(JSON.stringify(t)) } diff --git a/packages/uts/src/index.ts b/packages/uts/src/index.ts index 32e297c41d6ec25ce2cfb135bc1b37cc8a0accdd..a5876c7be166253d5161318da8d8b36bde1f10ad 100644 --- a/packages/uts/src/index.ts +++ b/packages/uts/src/index.ts @@ -5,11 +5,12 @@ import glob from 'fast-glob' import chokidar from 'chokidar' import { toKotlin, toSwift } from './api' -import type { +import { UtsInputOptions, UtsOptions, UtsOutputOptions, UtsResult, + UtsTarget, } from './types' import { printDone, @@ -19,10 +20,7 @@ import { timeEnd, } from './utils' -export enum UtsTarget { - KOTLIN = 'kotlin', - SWIFT = 'swift', -} +export { UtsTarget } from './types' export type UtsMode = 'dev' | 'build' @@ -299,7 +297,7 @@ function buildFile( }) } -export { parse } from './api' +export { parse, bundle } from './api' export function runDev(target: UtsTarget, opts: ToOptions) { opts = parseOptions('dev', target, opts) diff --git a/packages/uts/src/types.ts b/packages/uts/src/types.ts index 8a5602b03a61a1b30e9dc8c1b2d7b0aae7380a98..b57a0f6923ee64d57c4191166f62f13ea3c7b0f8 100644 --- a/packages/uts/src/types.ts +++ b/packages/uts/src/types.ts @@ -1,3 +1,7 @@ +export enum UtsTarget { + KOTLIN = 'kotlin', + SWIFT = 'swift', +} export interface UtsParserConfig { /** * Defaults to `false` @@ -33,3 +37,11 @@ export interface UtsResult { time?: number error?: Error } + +export interface UtsBundleOptions { + target: UtsTarget + entry: Record + output: { + path: string + } +} diff --git a/scripts/setupJestEnv.ts b/scripts/setupJestEnv.ts index 2ab5b4bc47fc04b3e367bd1909839f0ed6b79203..b50507bd2510b1b91041d46fe99a02e52e0a1cd8 100644 --- a/scripts/setupJestEnv.ts +++ b/scripts/setupJestEnv.ts @@ -3,3 +3,15 @@ console.log('publishHandler', JSON.stringify(args)) }, } +;(global as any).uni = { + requireNativePlugin(name: string) { + return { + invokeSync(args: unknown, callback: unknown) { + console.log(`invoke`, JSON.stringify(args)) + }, + invokeAsync(args: unknown, callback: unknown) { + console.log(`invokeAsync`, JSON.stringify(args)) + }, + } + }, +} diff --git a/scripts/test.js b/scripts/test.js index bf80ebee9561afadb853a79af43ce789cdcf7103..6a0f7f167179f67235da5bb0c12914c66c879935 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -1,12 +1,15 @@ const fs = require('fs') const path = require('path') -const { parse, runBuild, UtsTarget } = require('../packages/uts/dist') +const { parse, runBuild, bundle, UtsTarget } = require('../packages/uts/dist') const projectDir = path.resolve(__dirname, '../packages/playground/uts') const start = Date.now() parse( fs.readFileSync( - path.resolve(projectDir, 'uni_modules/test-uniplugin/interface.uts'), + path.resolve( + projectDir, + 'uni_modules/test-uniplugin/app-android/index.uts' + ), 'utf8' ) ).then((res) => { @@ -14,6 +17,23 @@ parse( console.log(JSON.stringify(res)) }) +// bundle({ +// entry: { +// 'test-uniplugin': path.resolve( +// projectDir, +// 'uni_modules/test-uniplugin/app-android/index.uts' +// ), +// }, +// output: { +// path: path.resolve( +// projectDir, +// 'unpackage/dist/app-plus/uni_modules/test-uniplugin/bundle' +// ), +// }, +// }).then((res) => { +// console.log(res) +// }) + // uts runBuild(UtsTarget.KOTLIN, { silent: false,