isomorfeus-asset-manager 0.13.8 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a755b3c964b1e4463ac86d3a107bfa96cf1e3711013f3d27ab360805e54a52
-  data.tar.gz: a61345d86fd03993f9eeb0f27528731285135a200208e3065c0e2cd2737bcb5a
+  metadata.gz: 29a8996427cbdbdefb49aa3d46579b8dcdcc5aaa850476d0a1bdc13cc009f75e
+  data.tar.gz: 556fde88121019a4811d05e4267f8077f412a58ec07c6c8bdcb69513e8abb023
 SHA512:
-  metadata.gz: 7847d671507e887ae60b0577b3b9bbe2811dc004ca5ada5392d04df064e9bb58f1d80fd6af79d5d20d6611788d27351e5b5e467d155039ad07b0e19e917aa4ef
-  data.tar.gz: 55e4afab66c907df3655198dd52271be34d8f2a43b77ebc3dc4881a48df64bb29980c05013057c71a5653105b431922dbbad063f3573413b280ac1534e5b3fa8
+  metadata.gz: a848d44e453b48cb36b7f3434ef9352c97acca78d04badd629412c55bf5e208d1f87bcca3c4aacbbfc507e2cd9af9e295b91ecb735f7a4e4cb3e52ab1ab922fa
+  data.tar.gz: 62118579a5c022ed59f222c0b5d282e8ea8447fa2ce4cc9ef0641e7b0d7b94ea98296df526ca982288b8ff196452c8f468fe8a293e92ee33b5f6f13d0ff6edd0

data/README.md

@@ -1,12 +1,15 @@
-# isomorfeus-asset-manager
+<h1 align="center">
+  <img src="https://github.com/isomorfeus/isomorfeus-asset-manager/blob/master/Logo.png?raw=true" align="center" width="234" height="182" />
+  <br/>
+  Isomorfeus Asset Manager<br/>
+</h1>
 
 Convenient and well performing on demand asset bundling for the isomorfeus framework project, internally using esbuild (esbuild-wasm).
 
-Version follows esbuild version: 0.12.x comes with esbuild 0.12.y.
+Version follows esbuild version: 0.13.x comes with esbuild 0.13.y.
 
 No need to install esbuild separately, everything bundled ready to go.
 However, if within the project the 'esbuild' npm package is installed in node_modules, that version will be used instead.
 
 ### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
-
+At the [Isomorfeus Framework Project](http://isomorfeus.com)

data/lib/isomorfeus/asset_manager/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   class AssetManager
-    VERSION = '0.13.8'
+    VERSION = '0.14.2'
   end
 end

data/node_modules/.package-lock.json

@@ -4,9 +4,9 @@
   "requires": true,
   "packages": {
     "node_modules/esbuild-wasm": {
-      "version": "0.13.13",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.13.tgz",
-      "integrity": "sha512-oy0ULEK7Vjb61nBbvdeuZwuASexHtUJsMK4+Z9ge+O6Oq1nq/yUlpefMXl5LUpgWUQViNCxlEz536xvYIsTO5w==",
+      "version": "0.14.8",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.8.tgz",
+      "integrity": "sha512-EbubkOStz5BSazbqLLiPAnyJD23NyGVVy1am/nB5H/aG3ra4SKfidfrtkPsHiHIpYjLo9fFZGLTzt9r3WcR3qg==",
       "bin": {
         "esbuild": "bin/esbuild"
       },

data/node_modules/esbuild-wasm/esm/browser.d.ts

@@ -232,6 +232,7 @@ export interface TransformOptions extends CommonOptions {
       jsxFragmentFactory?: string,
       useDefineForClassFields?: boolean,
       importsNotUsedAsValues?: 'remove' | 'preserve' | 'error',
+      preserveValueImports?: boolean,
     },
   };
 
@@ -259,6 +260,8 @@ export interface Plugin {
 
 export interface PluginBuild {
   initialOptions: BuildOptions;
+  resolve(path: string, options?: ResolveOptions): Promise<ResolveResult>;
+
   onStart(callback: () =>
     (OnStartResult | null | void | Promise<OnStartResult | null | void>)): void;
   onEnd(callback: (result: BuildResult) =>
@@ -267,6 +270,41 @@ export interface PluginBuild {
     (OnResolveResult | null | undefined | Promise<OnResolveResult | null | undefined>)): void;
   onLoad(options: OnLoadOptions, callback: (args: OnLoadArgs) =>
     (OnLoadResult | null | undefined | Promise<OnLoadResult | null | undefined>)): void;
+
+  // This is a full copy of the esbuild library in case you need it
+  esbuild: {
+    serve: typeof serve,
+    build: typeof build,
+    buildSync: typeof buildSync,
+    transform: typeof transform,
+    transformSync: typeof transformSync,
+    formatMessages: typeof formatMessages,
+    formatMessagesSync: typeof formatMessagesSync,
+    analyzeMetafile: typeof analyzeMetafile,
+    analyzeMetafileSync: typeof analyzeMetafileSync,
+    initialize: typeof initialize,
+    version: typeof version,
+  };
+}
+
+export interface ResolveOptions {
+  importer?: string;
+  namespace?: string;
+  resolveDir?: string;
+  kind?: ImportKind;
+  pluginData?: any;
+}
+
+export interface ResolveResult {
+  errors: Message[];
+  warnings: Message[];
+
+  path: string;
+  external: boolean;
+  sideEffects: boolean;
+  namespace: string;
+  suffix: string;
+  pluginData: any;
 }
 
 export interface OnStartResult {
@@ -311,6 +349,7 @@ export interface OnResolveResult {
   external?: boolean;
   sideEffects?: boolean;
   namespace?: string;
+  suffix?: string;
   pluginData?: any;
 
   watchFiles?: string[];
@@ -325,6 +364,7 @@ export interface OnLoadOptions {
 export interface OnLoadArgs {
   path: string;
   namespace: string;
+  suffix: string;
   pluginData: any;
 }
 

data/node_modules/esbuild-wasm/esm/browser.js

@@ -17,6 +17,26 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+// lib/npm/browser.ts
+var browser_exports = {};
+__export(browser_exports, {
+  analyzeMetafile: () => analyzeMetafile,
+  analyzeMetafileSync: () => analyzeMetafileSync,
+  build: () => build,
+  buildSync: () => buildSync,
+  formatMessages: () => formatMessages,
+  formatMessagesSync: () => formatMessagesSync,
+  initialize: () => initialize,
+  serve: () => serve,
+  transform: () => transform,
+  transformSync: () => transformSync,
+  version: () => version
+});
 
 // lib/shared/stdio_protocol.ts
 function encodePacket(packet) {
@@ -531,11 +551,10 @@ function flagsForTransformOptions(callName, options, isTTY, logLevelDefault) {
   return flags;
 }
 function createChannel(streamIn) {
-  let responseCallbacks = new Map();
-  let pluginCallbacks = new Map();
-  let watchCallbacks = new Map();
-  let serveCallbacks = new Map();
-  let nextServeID = 0;
+  let responseCallbacks = /* @__PURE__ */ new Map();
+  let pluginCallbacks = /* @__PURE__ */ new Map();
+  let watchCallbacks = /* @__PURE__ */ new Map();
+  let serveCallbacks = /* @__PURE__ */ new Map();
   let isClosed = false;
   let nextRequestID = 0;
   let nextBuildKey = 0;
@@ -612,7 +631,7 @@ function createChannel(streamIn) {
           sendResponse(id, {});
           break;
         }
-        case "start": {
+        case "on-start": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -620,7 +639,7 @@ function createChannel(streamIn) {
             sendResponse(id, await callback(request));
           break;
         }
-        case "resolve": {
+        case "on-resolve": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -628,7 +647,7 @@ function createChannel(streamIn) {
             sendResponse(id, await callback(request));
           break;
         }
-        case "load": {
+        case "on-load": {
           let callback = pluginCallbacks.get(request.key);
           if (!callback)
             sendResponse(id, {});
@@ -637,21 +656,21 @@ function createChannel(streamIn) {
           break;
         }
         case "serve-request": {
-          let callbacks = serveCallbacks.get(request.serveID);
+          let callbacks = serveCallbacks.get(request.key);
           if (callbacks && callbacks.onRequest)
             callbacks.onRequest(request.args);
           sendResponse(id, {});
           break;
         }
         case "serve-wait": {
-          let callbacks = serveCallbacks.get(request.serveID);
+          let callbacks = serveCallbacks.get(request.key);
           if (callbacks)
             callbacks.onWait(request.error);
           sendResponse(id, {});
           break;
         }
         case "watch-rebuild": {
-          let callback = watchCallbacks.get(request.watchID);
+          let callback = watchCallbacks.get(request.key);
           try {
             if (callback)
               callback(null, request.args);
@@ -673,8 +692,8 @@ function createChannel(streamIn) {
     if (isFirstPacket) {
       isFirstPacket = false;
       let binaryVersion = String.fromCharCode(...bytes);
-      if (binaryVersion !== "0.13.13") {
-        throw new Error(`Cannot start service: Host version "${"0.13.13"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
+      if (binaryVersion !== "0.14.8") {
+        throw new Error(`Cannot start service: Host version "${"0.14.8"}" does not match binary version ${JSON.stringify(binaryVersion)}`);
       }
       return;
     }
@@ -690,7 +709,7 @@ function createChannel(streamIn) {
         callback(null, packet.value);
     }
   };
-  let handlePlugins = async (initialOptions, plugins, buildKey, stash) => {
+  let handlePlugins = async (initialOptions, plugins, buildKey, stash, refs) => {
     let onStartCallbacks = [];
     let onEndCallbacks = [];
     let onResolveCallbacks = {};
@@ -698,12 +717,13 @@ function createChannel(streamIn) {
     let nextCallbackID = 0;
     let i = 0;
     let requestPlugins = [];
+    let isSetupDone = false;
     plugins = [...plugins];
     for (let item of plugins) {
       let keys = {};
       if (typeof item !== "object")
         throw new Error(`Plugin at index ${i} must be an object`);
-      let name = getFlag(item, keys, "name", mustBeString);
+      const name = getFlag(item, keys, "name", mustBeString);
       if (typeof name !== "string" || name === "")
         throw new Error(`Plugin at index ${i} is missing a name`);
       try {
@@ -717,20 +737,67 @@ function createChannel(streamIn) {
           onLoad: []
         };
         i++;
+        let resolve = (path, options = {}) => {
+          if (!isSetupDone)
+            throw new Error('Cannot call "resolve" before plugin setup has completed');
+          if (typeof path !== "string")
+            throw new Error(`The path to resolve must be a string`);
+          let keys2 = Object.create(null);
+          let importer = getFlag(options, keys2, "importer", mustBeString);
+          let namespace = getFlag(options, keys2, "namespace", mustBeString);
+          let resolveDir = getFlag(options, keys2, "resolveDir", mustBeString);
+          let kind = getFlag(options, keys2, "kind", mustBeString);
+          let pluginData = getFlag(options, keys2, "pluginData", canBeAnything);
+          checkForInvalidFlags(options, keys2, "in resolve() call");
+          return new Promise((resolve2, reject) => {
+            const request = {
+              command: "resolve",
+              path,
+              key: buildKey,
+              pluginName: name
+            };
+            if (importer != null)
+              request.importer = importer;
+            if (namespace != null)
+              request.namespace = namespace;
+            if (resolveDir != null)
+              request.resolveDir = resolveDir;
+            if (kind != null)
+              request.kind = kind;
+            if (pluginData != null)
+              request.pluginData = stash.store(pluginData);
+            sendRequest(refs, request, (error, response) => {
+              if (error !== null)
+                reject(new Error(error));
+              else
+                resolve2({
+                  errors: replaceDetailsInMessages(response.errors, stash),
+                  warnings: replaceDetailsInMessages(response.warnings, stash),
+                  path: response.path,
+                  external: response.external,
+                  sideEffects: response.sideEffects,
+                  namespace: response.namespace,
+                  suffix: response.suffix,
+                  pluginData: stash.load(response.pluginData)
+                });
+            });
+          });
+        };
         let promise = setup({
           initialOptions,
+          resolve,
           onStart(callback2) {
-            let registeredText = `This error came from the "onStart" callback registered here`;
+            let registeredText = `This error came from the "onStart" callback registered here:`;
             let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onStart");
             onStartCallbacks.push({ name, callback: callback2, note: registeredNote });
           },
           onEnd(callback2) {
-            let registeredText = `This error came from the "onEnd" callback registered here`;
+            let registeredText = `This error came from the "onEnd" callback registered here:`;
             let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onEnd");
             onEndCallbacks.push({ name, callback: callback2, note: registeredNote });
           },
           onResolve(options, callback2) {
-            let registeredText = `This error came from the "onResolve" callback registered here`;
+            let registeredText = `This error came from the "onResolve" callback registered here:`;
             let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onResolve");
             let keys2 = {};
             let filter = getFlag(options, keys2, "filter", mustBeRegExp);
@@ -743,7 +810,7 @@ function createChannel(streamIn) {
             plugin.onResolve.push({ id, filter: filter.source, namespace: namespace || "" });
           },
           onLoad(options, callback2) {
-            let registeredText = `This error came from the "onLoad" callback registered here`;
+            let registeredText = `This error came from the "onLoad" callback registered here:`;
             let registeredNote = extractCallerV8(new Error(registeredText), streamIn, "onLoad");
             let keys2 = {};
             let filter = getFlag(options, keys2, "filter", mustBeRegExp);
@@ -754,7 +821,8 @@ function createChannel(streamIn) {
             let id = nextCallbackID++;
             onLoadCallbacks[id] = { name, callback: callback2, note: registeredNote };
             plugin.onLoad.push({ id, filter: filter.source, namespace: namespace || "" });
-          }
+          },
+          esbuild: streamIn.esbuild
         });
         if (promise)
           await promise;
@@ -765,7 +833,7 @@ function createChannel(streamIn) {
     }
     const callback = async (request) => {
       switch (request.command) {
-        case "start": {
+        case "on-start": {
           let response = { errors: [], warnings: [] };
           await Promise.all(onStartCallbacks.map(async ({ name, callback: callback2, note }) => {
             try {
@@ -788,7 +856,7 @@ function createChannel(streamIn) {
           }));
           return response;
         }
-        case "resolve": {
+        case "on-resolve": {
           let response = {}, name = "", callback2, note;
           for (let id of request.ids) {
             try {
@@ -808,6 +876,7 @@ function createChannel(streamIn) {
                 let pluginName = getFlag(result, keys, "pluginName", mustBeString);
                 let path = getFlag(result, keys, "path", mustBeString);
                 let namespace = getFlag(result, keys, "namespace", mustBeString);
+                let suffix = getFlag(result, keys, "suffix", mustBeString);
                 let external = getFlag(result, keys, "external", mustBeBoolean);
                 let sideEffects = getFlag(result, keys, "sideEffects", mustBeBoolean);
                 let pluginData = getFlag(result, keys, "pluginData", canBeAnything);
@@ -823,6 +892,8 @@ function createChannel(streamIn) {
                   response.path = path;
                 if (namespace != null)
                   response.namespace = namespace;
+                if (suffix != null)
+                  response.suffix = suffix;
                 if (external != null)
                   response.external = external;
                 if (sideEffects != null)
@@ -845,7 +916,7 @@ function createChannel(streamIn) {
           }
           return response;
         }
-        case "load": {
+        case "on-load": {
           let response = {}, name = "", callback2, note;
           for (let id of request.ids) {
             try {
@@ -853,6 +924,7 @@ function createChannel(streamIn) {
               let result = await callback2({
                 path: request.path,
                 namespace: request.namespace,
+                suffix: request.suffix,
                 pluginData: stash.load(request.pluginData)
               });
               if (result != null) {
@@ -916,6 +988,7 @@ function createChannel(streamIn) {
         })().then(done);
       };
     }
+    isSetupDone = true;
     let refCount = 0;
     return {
       ok: true,
@@ -933,24 +1006,23 @@ function createChannel(streamIn) {
       }
     };
   };
-  let buildServeData = (refs, options, request) => {
+  let buildServeData = (refs, options, request, key) => {
     let keys = {};
     let port = getFlag(options, keys, "port", mustBeInteger);
     let host = getFlag(options, keys, "host", mustBeString);
     let servedir = getFlag(options, keys, "servedir", mustBeString);
     let onRequest = getFlag(options, keys, "onRequest", mustBeFunction);
-    let serveID = nextServeID++;
     let onWait;
     let wait = new Promise((resolve, reject) => {
       onWait = (error) => {
-        serveCallbacks.delete(serveID);
+        serveCallbacks.delete(key);
         if (error !== null)
           reject(new Error(error));
         else
           resolve();
       };
     });
-    request.serve = { serveID };
+    request.serve = {};
     checkForInvalidFlags(options, keys, `in serve() call`);
     if (port !== void 0)
       request.serve.port = port;
@@ -958,14 +1030,14 @@ function createChannel(streamIn) {
       request.serve.host = host;
     if (servedir !== void 0)
       request.serve.servedir = servedir;
-    serveCallbacks.set(serveID, {
+    serveCallbacks.set(key, {
       onRequest,
       onWait
     });
     return {
       wait,
       stop() {
-        sendRequest(refs, { command: "serve-stop", serveID }, () => {
+        sendRequest(refs, { command: "serve-stop", key }, () => {
         });
       }
     };
@@ -1005,7 +1077,7 @@ function createChannel(streamIn) {
     if (plugins && plugins.length > 0) {
       if (streamIn.isSync)
         return handleError(new Error("Cannot use plugins in synchronous API calls"), "");
-      handlePlugins(options, plugins, key, details).then((result) => {
+      handlePlugins(options, plugins, key, details, refs).then((result) => {
         if (!result.ok) {
           handleError(result.error, result.pluginName);
         } else {
@@ -1093,7 +1165,7 @@ function createChannel(streamIn) {
     };
     if (requestPlugins)
       request.plugins = requestPlugins;
-    let serve2 = serveOptions && buildServeData(refs, serveOptions, request);
+    let serve2 = serveOptions && buildServeData(refs, serveOptions, request, key);
     let rebuild;
     let stop;
     let copyResponseToResult = (response, result) => {
@@ -1114,13 +1186,13 @@ function createChannel(streamIn) {
         if (result.errors.length > 0) {
           return callback2(failureErrorWithLog("Build failed", result.errors, result.warnings), null);
         }
-        if (response.rebuildID !== void 0) {
+        if (response.rebuild) {
           if (!rebuild) {
             let isDisposed = false;
             rebuild = () => new Promise((resolve, reject) => {
               if (isDisposed || isClosed)
                 throw new Error("Cannot rebuild");
-              sendRequest(refs, { command: "rebuild", rebuildID: response.rebuildID }, (error2, response2) => {
+              sendRequest(refs, { command: "rebuild", key }, (error2, response2) => {
                 if (error2) {
                   const message = { pluginName: "", text: error2, location: null, notes: [], detail: void 0 };
                   return callback2(failureErrorWithLog("Build failed", [message], []), null);
@@ -1138,14 +1210,14 @@ function createChannel(streamIn) {
               if (isDisposed)
                 return;
               isDisposed = true;
-              sendRequest(refs, { command: "rebuild-dispose", rebuildID: response.rebuildID }, () => {
+              sendRequest(refs, { command: "rebuild-dispose", key }, () => {
               });
               refs.unref();
             };
           }
           result.rebuild = rebuild;
         }
-        if (response.watchID !== void 0) {
+        if (response.watch) {
           if (!stop) {
             let isStopped = false;
             refs.ref();
@@ -1153,13 +1225,13 @@ function createChannel(streamIn) {
               if (isStopped)
                 return;
               isStopped = true;
-              watchCallbacks.delete(response.watchID);
-              sendRequest(refs, { command: "watch-stop", watchID: response.watchID }, () => {
+              watchCallbacks.delete(key);
+              sendRequest(refs, { command: "watch-stop", key }, () => {
               });
               refs.unref();
             };
             if (watch) {
-              watchCallbacks.set(response.watchID, (serviceStopError, watchResponse) => {
+              watchCallbacks.set(key, (serviceStopError, watchResponse) => {
                 if (serviceStopError) {
                   if (watch.onRebuild)
                     watch.onRebuild(serviceStopError, null);
@@ -1348,7 +1420,7 @@ function createChannel(streamIn) {
   };
 }
 function createObjectStash() {
-  const map = new Map();
+  const map = /* @__PURE__ */ new Map();
   let nextID = 0;
   return {
     load(id) {
@@ -1452,7 +1524,7 @@ error: ${e.text}`;
     let { file, line, column } = e.location;
     let pluginText = e.pluginName ? `[plugin: ${e.pluginName}] ` : "";
     return `
-${file}:${line}:${column}: error: ${pluginText}${e.text}`;
+${file}:${line}:${column}: ERROR: ${pluginText}${e.text}`;
   }).join("");
   let error = new Error(`${text}${summary}`);
   error.errors = errors;
@@ -1546,7 +1618,7 @@ function convertOutputFiles({ path, contents }) {
 }
 
 // lib/npm/browser.ts
-var version = "0.13.13";
+var version = "0.14.8";
 var build = (options) => ensureServiceIsRunning().build(options);
 var serve = () => {
   throw new Error(`The "serve" API only works in node`);
@@ -2191,9 +2263,9 @@ var startRunningService = async (wasmURL, useWorker) => {
 
 			// The linker guarantees global data starts from at least wasmMinDataAddr.
 			// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
-			const wasmMinDataAddr = 4096 + 4096;
+			const wasmMinDataAddr = 4096 + 8192;
 			if (offset >= wasmMinDataAddr) {
-				throw new Error("command line too long");
+				throw new Error("total length of command line and environment variables exceeds limit");
 			}
 
 			this._inst.exports.run(argc, argv);
@@ -2303,7 +2375,7 @@ onmessage = ({ data: wasm }) => {
     callback(null, count);
   };
   let go = new global.Go();
-  go.argv = ["", \`--service=\${"0.13.13"}\`];
+  go.argv = ["", \`--service=\${"0.14.8"}\`];
   WebAssembly.instantiate(wasm, go.importObject).then(({ instance }) => go.run(instance));
 };}`;
   let worker;
@@ -2327,7 +2399,8 @@ onmessage = ({ data: wasm }) => {
       worker.postMessage(bytes);
     },
     isSync: false,
-    isBrowser: true
+    isBrowser: true,
+    esbuild: browser_exports
   });
   longLivedService = {
     build: (options) => new Promise((resolve, reject) => service.buildOrServe({