@utoo/web 1.0.6 → 1.1.0

package/esm/installServiceWorker.js

@@ -1,14 +1,17 @@
 import { ServiceWorkerHandShake } from "./message";
 export async function installServiceWorker(url, scope, targetDirToCwd) {
-    const registration = await navigator.serviceWorker.register(url, {
+    const swUrl = new URL(url, window.location.href);
+    swUrl.searchParams.set("scope", scope);
+    if (targetDirToCwd) {
+        swUrl.searchParams.set("targetDirToCwd", targetDirToCwd);
+    }
+    const registration = await navigator.serviceWorker.register(swUrl.toString(), {
         scope: "/",
     });
     return new Promise((resolve) => {
         function sendMessage(sw) {
             sw.postMessage({
                 [ServiceWorkerHandShake]: true,
-                scope,
-                targetDirToCwd,
             });
             resolve();
         }

package/esm/serviceWorker.js

@@ -5,8 +5,9 @@ let _promise = new Promise((resolve) => {
     _resolve = resolve;
 });
 let _projectEndpoint;
-let _serviceWorkerScope;
-let _targetDirToCwd;
+const params = new URLSearchParams(self.location.search);
+const _serviceWorkerScope = params.get("scope");
+const _targetDirToCwd = params.get("targetDirToCwd");
 self.addEventListener("install", (event) => {
     event.waitUntil(self.skipWaiting());
 });
@@ -15,27 +16,23 @@ self.addEventListener("activate", (event) => {
 });
 self.addEventListener("message", (event) => {
     if (event.data && event.data[ServiceWorkerHandShake] === true) {
-        _serviceWorkerScope = event.data.scope;
-        _targetDirToCwd = event.data.targetDirToCwd;
         _projectEndpoint = Project.fork(new MessageChannel(), event.source);
         _resolve();
     }
 });
 self.addEventListener("fetch", (event) => {
-    event.respondWith((async () => {
-        await _promise;
-        let { url: url_str, referrer } = event.request;
-        let url = new URL(url_str);
-        if (url.pathname.startsWith(_serviceWorkerScope) ||
-            (referrer && new URL(referrer).pathname.startsWith(_serviceWorkerScope))) {
-            const relativePathToCwd = (_targetDirToCwd !== null && _targetDirToCwd !== void 0 ? _targetDirToCwd : ".") +
-                url.pathname.replace(_serviceWorkerScope, "");
-            return readFileFromProject(relativePathToCwd);
+    let { url: urlStr } = event.request;
+    let url = new URL(urlStr);
+    if (typeof _serviceWorkerScope === "string") {
+        if (url.pathname.startsWith(_serviceWorkerScope)) {
+            event.respondWith((async () => {
+                await _promise;
+                const relativePathToCwd = (_targetDirToCwd !== null && _targetDirToCwd !== void 0 ? _targetDirToCwd : ".") +
+                    url.pathname.replace(_serviceWorkerScope, "");
+                return readFileFromProject(relativePathToCwd);
+            })());
         }
-        else {
-            return fetch(event.request);
-        }
-    })());
+    }
 });
 async function readFileFromProject(projectPath) {
     try {

package/esm/utoo/index.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @param {number} worker_id
+ * @returns {Promise<string>}
+ */
+export function recvMessageInWorker(worker_id: number): Promise<string>;
 /**
  * @returns {Promise<WorkerTermination>}
  */
@@ -14,11 +19,6 @@ export function notifyWorkerAck(task_id: number, worker_id: number): Promise<voi
  * @returns {Promise<void>}
  */
 export function sendTaskMessage(task_id: number, message: string): Promise<void>;
-/**
- * @param {number} worker_id
- * @returns {Promise<string>}
- */
-export function recvMessageInWorker(worker_id: number): Promise<string>;
 /**
  * @param {string} pool_id
  * @returns {Promise<number>}
@@ -28,11 +28,11 @@ export function recvWorkerRequest(pool_id: string): Promise<number>;
  * @returns {Promise<PoolOptions>}
  */
 export function recvPoolRequest(): Promise<PoolOptions>;
+export function init_pack(): void;
 /**
  * @param {string} filter
  */
 export function init_log_filter(filter: string): void;
-export function init_pack(): void;
 /**
  * Entry point for web workers
  * @param {number} ptr

package/esm/utoo/index.js

@@ -239,6 +239,14 @@ function makeClosure(arg0, arg1, dtor, f) {
     CLOSURE_DTORS.register(real, state, state);
     return real;
 }
+/**
+ * @param {number} worker_id
+ * @returns {Promise<string>}
+ */
+export function recvMessageInWorker(worker_id) {
+    const ret = wasm.recvMessageInWorker(worker_id);
+    return takeObject(ret);
+}
 /**
  * @returns {Promise<WorkerTermination>}
  */
@@ -266,14 +274,6 @@ export function sendTaskMessage(task_id, message) {
     const ret = wasm.sendTaskMessage(task_id, ptr0, len0);
     return takeObject(ret);
 }
-/**
- * @param {number} worker_id
- * @returns {Promise<string>}
- */
-export function recvMessageInWorker(worker_id) {
-    const ret = wasm.recvMessageInWorker(worker_id);
-    return takeObject(ret);
-}
 /**
  * @param {string} pool_id
  * @returns {Promise<number>}
@@ -291,6 +291,9 @@ export function recvPoolRequest() {
     const ret = wasm.recvPoolRequest();
     return takeObject(ret);
 }
+export function init_pack() {
+    wasm.init_pack();
+}
 /**
  * @param {string} filter
  */
@@ -299,9 +302,6 @@ export function init_log_filter(filter) {
     const len0 = WASM_VECTOR_LEN;
     wasm.init_log_filter(ptr0, len0);
 }
-export function init_pack() {
-    wasm.init_pack();
-}
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -315,8 +315,8 @@ function passArray8ToWasm0(arg, malloc) {
 export function wasm_thread_entry_point(ptr) {
     wasm.wasm_thread_entry_point(ptr);
 }
-function __wbg_adapter_10(arg0, arg1) {
-    wasm.__wbindgen_export_6(arg0, arg1);
+function __wbg_adapter_6(arg0, arg1, arg2) {
+    wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2));
 }
 let stack_pointer = 128;
 function addBorrowedObject(obj) {
@@ -325,7 +325,7 @@ function addBorrowedObject(obj) {
     heap[--stack_pointer] = obj;
     return stack_pointer;
 }
-function __wbg_adapter_15(arg0, arg1, arg2) {
+function __wbg_adapter_13(arg0, arg1, arg2) {
     try {
         wasm.__wbindgen_export_7(arg0, arg1, addBorrowedObject(arg2));
     }
@@ -333,10 +333,10 @@ function __wbg_adapter_15(arg0, arg1, arg2) {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wbg_adapter_18(arg0, arg1, arg2) {
-    wasm.__wbindgen_export_8(arg0, arg1, addHeapObject(arg2));
+function __wbg_adapter_16(arg0, arg1) {
+    wasm.__wbindgen_export_8(arg0, arg1);
 }
-function __wbg_adapter_27(arg0, arg1, arg2) {
+function __wbg_adapter_19(arg0, arg1, arg2) {
     wasm.__wbindgen_export_9(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_94(arg0, arg1, arg2, arg3) {
@@ -1620,19 +1620,24 @@ function __wbg_get_imports() {
             return ret;
         }, arguments);
     };
+    imports.wbg.__wbindgen_cast_12af9e1632226a2a = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8603, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8626, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, 8603, __wbg_adapter_13);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function (arg0, arg1) {
         // Cast intrinsic for `Ref(String) -> Externref`.
         const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_228b11ff07fcd80f = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8687, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8687, __wbg_adapter_10);
+    imports.wbg.__wbindgen_cast_26f8fe7fb5e9a165 = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8621, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8622, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, 8621, __wbg_adapter_19);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_3255823a0b603d96 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8685, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8661, __wbg_adapter_15);
+    imports.wbg.__wbindgen_cast_341c6edfb226ca8c = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8621, function: Function { arguments: [Externref], shim_idx: 8622, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, 8621, __wbg_adapter_19);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function (arg0) {
@@ -1642,12 +1647,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_4c807b347a3d0cbf = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 599, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_10);
+        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_16);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_535e935a655d72df = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [Externref], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
+    imports.wbg.__wbindgen_cast_60ddcd55e3b8f21d = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8621, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, 8621, __wbg_adapter_16);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_76322aab70622876 = function (arg0, arg1) {
@@ -1664,6 +1669,11 @@ function __wbg_get_imports() {
         const ret = v0;
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cast_7d864cd0d8fe5a0e = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8603, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8604, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+        const ret = makeClosure(arg0, arg1, 8603, __wbg_adapter_6);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_cast_9ae0607507abb057 = function (arg0) {
         // Cast intrinsic for `I64 -> Externref`.
         const ret = arg0;
@@ -1674,16 +1684,6 @@ function __wbg_get_imports() {
         const ret = arg0;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_ded0188a991d8b3c = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbindgen_cast_ffa04fbd359d627f = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8662, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-        const ret = makeClosure(arg0, arg1, 8661, __wbg_adapter_27);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_link_dd5153a359f2e504 = function (arg0) {
         const val = `onmessage = function (ev) {
             let [ia, index, value] = ev.data;
@@ -1708,7 +1708,7 @@ function __wbg_get_imports() {
     return imports;
 }
 function __wbg_init_memory(imports, memory) {
-    imports.wbg.memory = memory || new WebAssembly.Memory({ initial: 129, maximum: 16384, shared: true });
+    imports.wbg.memory = memory || new WebAssembly.Memory({ initial: 130, maximum: 16384, shared: true });
 }
 function __wbg_finalize_init(instance, module, thread_stack_size) {
     wasm = instance.exports;

package/esm/webpackLoaders/loaders/less-loader/index.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: true,
+    value: true
 });
 exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _options = _interopRequireDefault(require("./options.json"));
 var _utils = require("./utils");
-function _interopRequireDefault(e) {
-    return e && e.__esModule ? e : { default: e };
-}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 async function lessLoader(source) {
     const options = this.getOptions(_options.default);
     const callback = this.async();
@@ -28,15 +26,12 @@ async function lessLoader(source) {
     const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
     if (useSourceMap) {
         lessOptions.sourceMap = {
-            outputSourceFiles: true,
+            outputSourceFiles: true
         };
     }
     let data = source;
     if (typeof options.additionalData !== "undefined") {
-        data =
-            typeof options.additionalData === "function"
-                ? `${await options.additionalData(data, this)}`
-                : `${options.additionalData}\n${data}`;
+        data = typeof options.additionalData === "function" ? `${await options.additionalData(data, this)}` : `${options.additionalData}\n${data}`;
     }
     const logger = this.getLogger("less-loader");
     const loaderContext = this;
@@ -64,7 +59,7 @@ async function lessLoader(source) {
         },
         debug(message) {
             logger.debug(message);
-        },
+        }
     };
     implementation.logger.addListener(loggerListener);
     let result;
@@ -87,7 +82,7 @@ async function lessLoader(source) {
         delete lessOptions.pluginManager;
     }
     const { css, imports } = result;
-    imports.forEach((item) => {
+    imports.forEach(item => {
         if ((0, _utils.isUnsupportedUrl)(item)) {
             return;
         }
@@ -105,4 +100,4 @@ async function lessLoader(source) {
     }
     callback(null, css, map);
 }
-var _default = (exports.default = lessLoader);
+var _default = exports.default = lessLoader;

package/esm/webpackLoaders/loaders/less-loader/options.json

@@ -41,9 +41,7 @@
                 },
                 {
                     "type": "string",
-                    "enum": [
-                        "only"
-                    ]
+                    "enum": ["only"]
                 }
             ]
         },

package/esm/webpackLoaders/loaders/less-loader/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 const { type } = require("os");
 Object.defineProperty(exports, "__esModule", {
-    value: true,
+    value: true
 });
 exports.errorFactory = errorFactory;
 exports.getLessImplementation = getLessImplementation;
@@ -9,9 +9,7 @@ exports.getLessOptions = getLessOptions;
 exports.isUnsupportedUrl = isUnsupportedUrl;
 exports.normalizeSourceMap = normalizeSourceMap;
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) {
-    return e && e.__esModule ? e : { default: e };
-}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable class-methods-use-this */
 const trailingSlash = /[/\\]$/;
 // This somewhat changed in Less 3.x. Now the file name comes without the
@@ -44,7 +42,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         mainFields: ["less", "style", "main", "..."],
         mainFiles: ["index", "..."],
         extensions: [".less", ".css"],
-        preferRelative: true,
+        preferRelative: true
     });
     class WebpackFileManager extends implementation.FileManager {
         supports(filename) {
@@ -97,8 +95,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         async loadFile(filename, ...args) {
             let result;
             try {
-                if (IS_SPECIAL_MODULE_IMPORT.test(filename) ||
-                    lessOptions.webpackImporter === "only") {
+                if (IS_SPECIAL_MODULE_IMPORT.test(filename) || lessOptions.webpackImporter === "only") {
                     const error = new Error();
                     error.type = "Next";
                     throw error;
@@ -113,18 +110,13 @@ function createWebpackLessPlugin(loaderContext, implementation) {
                     result = await this.resolveFilename(filename, ...args);
                 }
                 catch (webpackResolveError) {
-                    error.message =
-                        `Less resolver error:\n${error.message}\n\n` +
-                            `Webpack resolver error details:\n${webpackResolveError.details}\n\n` +
-                            `Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
+                    error.message = `Less resolver error:\n${error.message}\n\n` + `Webpack resolver error details:\n${webpackResolveError.details}\n\n` + `Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
                     return Promise.reject(error);
                 }
                 loaderContext.addDependency(result);
                 return super.loadFile(result, ...args);
             }
-            const absoluteFilename = _path.default.isAbsolute(result.filename)
-                ? result.filename
-                : _path.default.resolve(".", result.filename);
+            const absoluteFilename = _path.default.isAbsolute(result.filename) ? result.filename : _path.default.resolve(".", result.filename);
             loaderContext.addDependency(_path.default.normalize(absoluteFilename));
             return result;
         }
@@ -133,7 +125,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         install(lessInstance, pluginManager) {
             pluginManager.addFileManager(new WebpackFileManager());
         },
-        minVersion: [3, 0, 0],
+        minVersion: [3, 0, 0]
     };
 }
 /**
@@ -145,21 +137,16 @@ function createWebpackLessPlugin(loaderContext, implementation) {
  * @returns {Object}
  */
 function getLessOptions(loaderContext, loaderOptions, implementation) {
-    const options = typeof loaderOptions.lessOptions === "function"
-        ? loaderOptions.lessOptions(loaderContext) || {}
-        : loaderOptions.lessOptions || {};
+    const options = typeof loaderOptions.lessOptions === "function" ? loaderOptions.lessOptions(loaderContext) || {} : loaderOptions.lessOptions || {};
     const lessOptions = {
         plugins: [],
         relativeUrls: true,
         // We need to set the filename because otherwise our WebpackFileManager will receive an undefined path for the entry
         filename: loaderContext.resourcePath,
-        ...options,
+        ...options
     };
     const plugins = lessOptions.plugins.slice();
-    const shouldUseWebpackImporter = typeof loaderOptions.webpackImporter === "boolean" ||
-        loaderOptions.webpackImporter === "only"
-        ? loaderOptions.webpackImporter
-        : true;
+    const shouldUseWebpackImporter = typeof loaderOptions.webpackImporter === "boolean" || loaderOptions.webpackImporter === "only" ? loaderOptions.webpackImporter : true;
     if (shouldUseWebpackImporter) {
         plugins.unshift(createWebpackLessPlugin(loaderContext, implementation));
     }
@@ -168,7 +155,7 @@ function getLessOptions(loaderContext, loaderOptions, implementation) {
             // eslint-disable-next-line no-param-reassign
             pluginManager.webpackLoaderContext = loaderContext;
             lessOptions.pluginManager = pluginManager;
-        },
+        }
     });
     lessOptions.plugins = plugins;
     return lessOptions;
@@ -192,7 +179,7 @@ function normalizeSourceMap(map) {
     newMap.sourceRoot = "";
     // `less` returns POSIX paths, that's why we need to transform them back to native paths.
     // eslint-disable-next-line no-param-reassign
-    newMap.sources = newMap.sources.map((source) => _path.default.normalize(source));
+    newMap.sources = newMap.sources.map(source => _path.default.normalize(source));
     return newMap;
 }
 function getLessImplementation(loaderContext, implementation) {
@@ -221,16 +208,9 @@ function getFileExcerptIfPossible(error) {
     return excerpt;
 }
 function errorFactory(error) {
-    const message = [
-        "\n",
-        ...getFileExcerptIfPossible(error),
-        error.message.charAt(0).toUpperCase() + error.message.slice(1),
-        error.filename
-            ? `      Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})`
-            : "",
-    ].join("\n");
+    const message = ["\n", ...getFileExcerptIfPossible(error), error.message.charAt(0).toUpperCase() + error.message.slice(1), error.filename ? `      Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})` : ""].join("\n");
     const obj = new Error(message, {
-        cause: error,
+        cause: error
     });
     obj.stack = null;
     return obj;