fyn 1.1.32 → 1.1.33

package/dist/fyn.js

@@ -1146,7 +1146,31 @@ const defaultRc = __webpack_require__("./cli/default-rc.js");
 
 const npmConfig = __webpack_require__("./cli/config/npm-config.js");
 
-const fynTil = __webpack_require__("./lib/util/fyntil.js");
+const fynTil = __webpack_require__("./lib/util/fyntil.js"); // replace any ${ENV} values with the appropriate environ.
+// copied from https://github.com/npm/config/blob/1f47a6c6ae7864b412d45c6a4a74930cf3365395/lib/env-replace.js
+
+
+const envExpr = /(?<!\\)(\\*)\$\{([^${}]+)\}/g;
+
+function replaceEnv(f, env) {
+  return f.replace(envExpr, (orig, esc, name) => {
+    const val = env[name] !== undefined ? env[name] : `$\{${name}}`; // consume the escape chars that are relevant.
+
+    if (esc.length % 2) {
+      return orig.slice((esc.length + 1) / 2);
+    }
+
+    return esc.slice(esc.length / 2) + val;
+  });
+}
+
+function replaceRcEnv(rc, env) {
+  for (const k in rc) {
+    if (rc[k] && rc[k].replace) {
+      rc[k] = replaceEnv(rc[k], env);
+    }
+  }
+}
 
 function readRc(fname) {
   const rcFname = Path.basename(fname);
@@ -1200,6 +1224,8 @@ function loadRc(cwd, fynpoDir) {
 
   const npmrc = _.merge.apply(_, [{}, npmConfig.defaults].concat(npmrcData));
 
+  replaceRcEnv(all, process.env);
+  replaceRcEnv(npmrc, process.env);
   return {
     all,
     npmrc,
@@ -4048,6 +4074,10 @@ const {
 
 const npmConfigEnv = __webpack_require__("./lib/util/npm-config-env.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 const readPkgJson = dir => {
   return fyntil.readPkgJson(dir).catch(() => {
     return {};
@@ -4169,7 +4199,12 @@ class LifecycleScripts {
       logLabel: `${pkgName} npm script ${scriptName}`,
       outputLabel: `${dimPkgName} npm script ${scriptName}`
     });
-    return ve.show(child);
+
+    try {
+      return await ve.show(child);
+    } catch (err) {
+      throw new AggregateError([err], `Failed running npm script '${name}' for package ${pkgName} at ${pkgDir}`);
+    }
   }
 
 }
@@ -4211,11 +4246,16 @@ const {
   runNpmScript
 } = __webpack_require__("./lib/util/run-npm-script.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 class LocalPkgBuilder {
   constructor(options) {
     this._options = options;
     this._fyn = options.fyn;
     this._waitItems = {};
+    this._failedItems = {};
   }
 
   async start() {
@@ -4238,11 +4278,17 @@ class LocalPkgBuilder {
     } = this._options;
 
     this._promiseQ.on("doneItem", data => {
-      this._waitItems[data.item.fullPath].resolve();
+      this._waitItems[data.item.fullPath].resolve({});
     });
 
     this._promiseQ.on("failItem", data => {
-      this._waitItems[data.item.fullPath].reject(data.error);
+      const itemRes = {
+        error: new AggregateError([data.error], `failed build local package at ${data.item.fullPath}`)
+      };
+
+      this._waitItems[data.item.fullPath].resolve(itemRes);
+
+      this._failedItems[data.item.fullPath] = itemRes;
     });
 
     this._defer = xaa.makeDefer();
@@ -4254,7 +4300,7 @@ class LocalPkgBuilder {
     });
 
     this._promiseQ.on("fail", data => {
-      this._defer.reject(data.error);
+      this._defer.reject(new AggregateError([data.error], `failed to build local packages`));
     }); //
     // localsByDepth is array of array: level 1 depths, level 2 packages
     //
@@ -4340,6 +4386,10 @@ class LocalPkgBuilder {
   }
 
   async processItem(item) {
+    if (!_.isEmpty(this._failedItems)) {
+      return;
+    }
+
     const dispPath = Path.relative(this._options.fyn._cwd, item.fullPath);
     const command = [process.argv[0], this._fynJs, this._fyn._options.registry && `--reg=${this._fyn._options.registry}`, "-q=d --pg=simple --no-build-local", !this._fyn._options.sourceMaps && "--no-source-maps"].filter(x => x).join(" ");
     const displayTitle = `building local pkg at ${dispPath}`;
@@ -6254,7 +6304,7 @@ class PkgDepResolver {
         }
 
         for (const name in deps) {
-          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name)) {
+          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name) || semverUtil.checkUrl(deps[name])) {
             continue;
           } //
           // Check if there is a fynpo package that match 'name@semver'?
@@ -7592,6 +7642,10 @@ const {
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 const {
   RESOLVE_ORDER,
   RSEMVERS,
@@ -7968,7 +8022,11 @@ class PkgInstaller {
 
   async _buildLocalPkg(depInfo) {
     if (this._fyn._options.buildLocal && this._fyn._localPkgBuilder) {
-      await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
+      const itemRes = await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
+
+      if (itemRes && itemRes.error) {
+        throw new AggregateError([itemRes.error], `install fail because local package build failed`);
+      }
     }
   }
 
@@ -10855,7 +10913,7 @@ function localSplit(v) {
 
 
 function getAsFilepath(semver) {
-  if (semver.startsWith("file:")) {
+  if (semver.startsWith("file:") || semver.startsWith("link:")) {
     return semver.substr(5);
   }
 
@@ -10975,7 +11033,7 @@ function analyze(semver) {
     } else if (urlType === "sym1") {
       sv.path = semver.substr(5);
       sv.localType = "sym1";
-    } else if (urlType === "file") {
+    } else if (urlType === "file" || urlType === "link") {
       setHardLocal(semver.substr(5));
     } else {
       sv.urlType = urlType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",