@beemo/core - npm Package Compare versions

Comparing version 2.1.3 to 2.1.4

dts/routines/CreateConfigRoutine.d.ts

@@ -32,3 +32,3 @@ import { Blueprint, Path, Schemas } from '@boost/common';
      */
-    mergeConfigs(context: Ctx, configs: ConfigObject[]): Promise<ConfigObject>;
+    mergeConfigs(context: Ctx, configs: ConfigObject[]): ConfigObject;
     /**
@@ -35,0 +35,0 @@ * Load a config file with passing the args and tool to the file.

lib/_virtual/_rollupPluginBabelHelpers.js

@@ -7,2 +7,247 @@ 'use strict';
 
+function createMetadataMethodsForProperty(metadataMap, kind, property) {
+  return {
+    getMetadata: function (key) {
+      if ("symbol" != typeof key) throw new TypeError("Metadata keys must be symbols, received: " + key);
+      var metadataForKey = metadataMap[key];
+      if (void 0 !== metadataForKey) if (1 === kind) {
+        var pub = metadataForKey.public;
+        if (void 0 !== pub) return pub[property];
+      } else if (2 === kind) {
+        var priv = metadataForKey.private;
+        if (void 0 !== priv) return priv.get(property);
+      } else if (Object.hasOwnProperty.call(metadataForKey, "constructor")) return metadataForKey.constructor;
+    },
+    setMetadata: function (key, value) {
+      if ("symbol" != typeof key) throw new TypeError("Metadata keys must be symbols, received: " + key);
+      var metadataForKey = metadataMap[key];
+
+      if (void 0 === metadataForKey && (metadataForKey = metadataMap[key] = {}), 1 === kind) {
+        var pub = metadataForKey.public;
+        void 0 === pub && (pub = metadataForKey.public = {}), pub[property] = value;
+      } else if (2 === kind) {
+        var priv = metadataForKey.priv;
+        void 0 === priv && (priv = metadataForKey.private = new Map()), priv.set(property, value);
+      } else metadataForKey.constructor = value;
+    }
+  };
+}
+
+function convertMetadataMapToFinal(obj, metadataMap) {
+  var parentMetadataMap = obj[Symbol.metadata || Symbol.for("Symbol.metadata")],
+      metadataKeys = Object.getOwnPropertySymbols(metadataMap);
+
+  if (0 !== metadataKeys.length) {
+    for (var i = 0; i < metadataKeys.length; i++) {
+      var key = metadataKeys[i],
+          metaForKey = metadataMap[key],
+          parentMetaForKey = parentMetadataMap ? parentMetadataMap[key] : null,
+          pub = metaForKey.public,
+          parentPub = parentMetaForKey ? parentMetaForKey.public : null;
+      pub && parentPub && Object.setPrototypeOf(pub, parentPub);
+      var priv = metaForKey.private;
+
+      if (priv) {
+        var privArr = Array.from(priv.values()),
+            parentPriv = parentMetaForKey ? parentMetaForKey.private : null;
+        parentPriv && (privArr = privArr.concat(parentPriv)), metaForKey.private = privArr;
+      }
+
+      parentMetaForKey && Object.setPrototypeOf(metaForKey, parentMetaForKey);
+    }
+
+    parentMetadataMap && Object.setPrototypeOf(metadataMap, parentMetadataMap), obj[Symbol.metadata || Symbol.for("Symbol.metadata")] = metadataMap;
+  }
+}
+
+function createAddInitializerMethod(initializers) {
+  return function (initializer) {
+    assertValidInitializer(initializer), initializers.push(initializer);
+  };
+}
+
+function memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStatic, isPrivate) {
+  var kindStr;
+
+  switch (kind) {
+    case 1:
+      kindStr = "accessor";
+      break;
+
+    case 2:
+      kindStr = "method";
+      break;
+
+    case 3:
+      kindStr = "getter";
+      break;
+
+    case 4:
+      kindStr = "setter";
+      break;
+
+    default:
+      kindStr = "field";
+  }
+
+  var metadataKind,
+      metadataName,
+      ctx = {
+    kind: kindStr,
+    name: isPrivate ? "#" + name : name,
+    isStatic: isStatic,
+    isPrivate: isPrivate
+  };
+
+  if (0 !== kind && (ctx.addInitializer = createAddInitializerMethod(initializers)), isPrivate) {
+    metadataKind = 2, metadataName = Symbol(name);
+    var access = {};
+    0 === kind ? (access.get = desc.get, access.set = desc.set) : 2 === kind ? access.get = function () {
+      return desc.value;
+    } : (1 !== kind && 3 !== kind || (access.get = function () {
+      return desc.get.call(this);
+    }), 1 !== kind && 4 !== kind || (access.set = function (v) {
+      desc.set.call(this, v);
+    })), ctx.access = access;
+  } else metadataKind = 1, metadataName = name;
+
+  return Object.assign(ctx, createMetadataMethodsForProperty(metadataMap, metadataKind, metadataName));
+}
+
+function assertValidInitializer(initializer) {
+  if ("function" != typeof initializer) throw new Error("initializers must be functions");
+}
+
+function assertValidReturnValue(kind, value) {
+  var type = typeof value;
+
+  if (1 === kind) {
+    if ("object" !== type || null === value) throw new Error("accessor decorators must return an object with get, set, or initializer properties or void 0");
+  } else if ("function" !== type) throw 0 === kind ? new Error("field decorators must return a initializer function or void 0") : new Error("method decorators must return a function or void 0");
+}
+
+function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers) {
+  var desc,
+      initializer,
+      value,
+      decs = decInfo[0];
+  isPrivate ? desc = 0 === kind || 1 === kind ? {
+    get: decInfo[3],
+    set: decInfo[4]
+  } : 3 === kind ? {
+    get: decInfo[3]
+  } : 4 === kind ? {
+    set: decInfo[3]
+  } : {
+    value: decInfo[3]
+  } : 0 !== kind && (desc = Object.getOwnPropertyDescriptor(base, name)), 1 === kind ? value = {
+    get: desc.get,
+    set: desc.set
+  } : 2 === kind ? value = desc.value : 3 === kind ? value = desc.get : 4 === kind && (value = desc.set);
+  var newValue,
+      get,
+      set,
+      ctx = memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStatic, isPrivate);
+  if ("function" == typeof decs) void 0 !== (newValue = decs(value, ctx)) && (assertValidReturnValue(kind, newValue), 0 === kind ? initializer = newValue : 1 === kind ? (initializer = newValue.initializer, get = newValue.get || value.get, set = newValue.set || value.set, value = {
+    get: get,
+    set: set
+  }) : value = newValue);else for (var i = decs.length - 1; i >= 0; i--) {
+    var newInit;
+    if (void 0 !== (newValue = (0, decs[i])(value, ctx))) assertValidReturnValue(kind, newValue), 0 === kind ? newInit = newValue : 1 === kind ? (newInit = newValue.initializer, get = newValue.get || value.get, set = newValue.set || value.set, value = {
+      get: get,
+      set: set
+    }) : value = newValue, void 0 !== newInit && (void 0 === initializer ? initializer = newInit : "function" == typeof initializer ? initializer = [initializer, newInit] : initializer.push(newInit));
+  }
+
+  if (0 === kind || 1 === kind) {
+    if (void 0 === initializer) initializer = function (instance, init) {
+      return init;
+    };else if ("function" != typeof initializer) {
+      var ownInitializers = initializer;
+
+      initializer = function (instance, init) {
+        for (var value = init, i = 0; i < ownInitializers.length; i++) value = ownInitializers[i].call(instance, value);
+
+        return value;
+      };
+    } else {
+      var originalInitializer = initializer;
+
+      initializer = function (instance, init) {
+        return originalInitializer.call(instance, init);
+      };
+    }
+    ret.push(initializer);
+  }
+
+  0 !== kind && (1 === kind ? (desc.get = value.get, desc.set = value.set) : 2 === kind ? desc.value = value : 3 === kind ? desc.get = value : 4 === kind && (desc.set = value), isPrivate ? 1 === kind ? (ret.push(function (instance, args) {
+    return value.get.call(instance, args);
+  }), ret.push(function (instance, args) {
+    return value.set.call(instance, args);
+  })) : 2 === kind ? ret.push(value) : ret.push(function (instance, args) {
+    return value.call(instance, args);
+  }) : Object.defineProperty(base, name, desc));
+}
+
+function applyMemberDecs(ret, Class, protoMetadataMap, staticMetadataMap, decInfos) {
+  for (var protoInitializers = [], staticInitializers = [], existingProtoNonFields = new Map(), existingStaticNonFields = new Map(), i = 0; i < decInfos.length; i++) {
+    var decInfo = decInfos[i];
+
+    if (Array.isArray(decInfo)) {
+      var base,
+          metadataMap,
+          initializers,
+          kind = decInfo[1],
+          name = decInfo[2],
+          isPrivate = decInfo.length > 3,
+          isStatic = kind >= 5;
+
+      if (isStatic ? (base = Class, metadataMap = staticMetadataMap, kind -= 5, initializers = staticInitializers) : (base = Class.prototype, metadataMap = protoMetadataMap, initializers = protoInitializers), 0 !== kind && !isPrivate) {
+        var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields,
+            existingKind = existingNonFields.get(name) || 0;
+        if (!0 === existingKind || 3 === existingKind && 4 !== kind || 4 === existingKind && 3 !== kind) throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+        !existingKind && kind > 2 ? existingNonFields.set(name, kind) : existingNonFields.set(name, !0);
+      }
+
+      applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers);
+    }
+  }
+
+  protoInitializers.length > 0 && pushInitializers(ret, protoInitializers), staticInitializers.length > 0 && pushInitializers(ret, staticInitializers);
+}
+
+function pushInitializers(ret, initializers) {
+  initializers.length > 0 ? (initializers = initializers.slice(), ret.push(function (instance) {
+    for (var i = 0; i < initializers.length; i++) initializers[i].call(instance, instance);
+
+    return instance;
+  })) : ret.push(function (instance) {
+    return instance;
+  });
+}
+
+function applyClassDecs(ret, targetClass, metadataMap, classDecs) {
+  for (var initializers = [], newClass = targetClass, name = targetClass.name, ctx = Object.assign({
+    kind: "class",
+    name: name,
+    addInitializer: createAddInitializerMethod(initializers)
+  }, createMetadataMethodsForProperty(metadataMap, 0, name)), i = classDecs.length - 1; i >= 0; i--) newClass = classDecs[i](newClass, ctx) || newClass;
+
+  ret.push(newClass), initializers.length > 0 ? ret.push(function () {
+    for (var i = 0; i < initializers.length; i++) initializers[i].call(newClass, newClass);
+  }) : ret.push(function () {});
+}
+
+function _applyDecs(targetClass, memberDecs, classDecs) {
+  var ret = [],
+      staticMetadataMap = {};
+
+  if (memberDecs) {
+    var protoMetadataMap = {};
+    applyMemberDecs(ret, targetClass, protoMetadataMap, staticMetadataMap, memberDecs), convertMetadataMapToFinal(targetClass.prototype, protoMetadataMap);
+  }
+
+  return classDecs && applyClassDecs(ret, targetClass, staticMetadataMap, classDecs), convertMetadataMapToFinal(targetClass, staticMetadataMap), ret;
+}
+
 function _asyncIterator(iterable) {
@@ -485,10 +730,10 @@ var method,
 
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
   Object.defineProperty(subClass, "prototype", {
-    value: Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    }),
     writable: false
@@ -1673,5 +1918,10 @@ });
 
+function _identity(x) {
+  return x;
+}
+
 exports.AsyncGenerator = _AsyncGenerator;
 exports.AwaitValue = _AwaitValue;
 exports.applyDecoratedDescriptor = _applyDecoratedDescriptor;
+exports.applyDecs = _applyDecs;
 exports.arrayLikeToArray = _arrayLikeToArray;
@@ -1720,2 +1970,3 @@ exports.arrayWithHoles = _arrayWithHoles;
 exports.getPrototypeOf = _getPrototypeOf;
+exports.identity = _identity;
 exports.inherits = _inherits;
@@ -1722,0 +1973,0 @@ exports.inheritsLoose = _inheritsLoose;

lib/Config.js

@@ -38,2 +38,5 @@ 'use strict';
   bootstrap() {
+    this.configureFinder({
+      errorIfNoRootFound: true
+    });
     this.addProcessHandler('drivers', config.mergePlugins);
@@ -40,0 +43,0 @@ this.addProcessHandler('scripts', config.mergePlugins);

lib/routines/CreateConfigRoutine.js

@@ -99,3 +99,3 @@ 'use strict';
 
-    return Promise.resolve(new common.Path());
+    return new common.Path();
   }
@@ -262,3 +262,3 @@ /**
 
-  async mergeConfigs(context, configs) {
+  mergeConfigs(context, configs) {
     const driver = this.options.driver;
@@ -269,3 +269,3 @@ this.debug('Merging %s config from %d sources', internal.color.symbol(driver.getName()), configs.length); // eslint-disable-next-line unicorn/prefer-object-from-entries
     driver.onMergeConfig.emit([context, config]);
-    return Promise.resolve(config);
+    return config;
   }
@@ -307,3 +307,3 @@ /**
 
-    return Promise.resolve(configs);
+    return configs;
   }
@@ -325,3 +325,3 @@ /**
 
-    return Promise.resolve(configs);
+    return configs;
   }
@@ -328,0 +328,0 @@ /**

lib/routines/driver/ExecuteCommandRoutine.js

@@ -199,3 +199,3 @@ 'use strict';
       });
-      return Promise.resolve(nativeOptions);
+      return nativeOptions;
     }
@@ -202,0 +202,0 @@

lib/routines/ScaffoldRoutine.js

@@ -23,7 +23,9 @@ 'use strict';
 
-    this.handleExec = (action, input) => this.executeCommand(action, [], {
-      input,
-      preferLocal: true,
-      shell: true
-    });
+    this.handleExec = async (action, input) => {
+      await this.executeCommand(action, [], {
+        input,
+        preferLocal: true,
+        shell: true
+      });
+    };
 
@@ -65,2 +67,3 @@ this.handlePrompter = () => ({
         debug: tool.config.debug,
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         exec: this.handleExec,
@@ -67,0 +70,0 @@ logger: new hygen.Logger(console.log),

package.json

 {
   "name": "@beemo/core",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "release": "1614239076609",
@@ -44,18 +44,18 @@ "description": "Manage all dev tool configurations in a single centralized repository.",
   "dependencies": {
-    "@boost/args": "^3.0.0",
-    "@boost/common": "^3.1.0",
-    "@boost/config": "^3.0.2",
-    "@boost/debug": "^3.0.1",
-    "@boost/event": "^3.0.0",
-    "@boost/internal": "^3.0.0",
-    "@boost/log": "^3.0.1",
-    "@boost/module": "^3.0.1",
-    "@boost/pipeline": "^3.2.0",
-    "@boost/plugin": "^3.0.2",
+    "@boost/args": "^3.0.1",
+    "@boost/common": "^3.2.1",
+    "@boost/config": "^3.2.0",
+    "@boost/debug": "^3.0.3",
+    "@boost/event": "^3.0.1",
+    "@boost/internal": "^3.0.1",
+    "@boost/log": "^3.0.3",
+    "@boost/module": "^3.1.0",
+    "@boost/pipeline": "^3.2.2",
+    "@boost/plugin": "^3.0.4",
     "@boost/terminal": "^3.0.0",
-    "@boost/translate": "^3.0.1",
+    "@boost/translate": "^3.0.3",
     "execa": "^5.1.1",
-    "fast-glob": "^3.2.7",
-    "fs-extra": "^10.0.0",
-    "hygen": "^6.1.0",
+    "fast-glob": "^3.2.11",
+    "fs-extra": "^10.0.1",
+    "hygen": "^6.1.5",
     "is-glob": "^4.0.3",
@@ -81,3 +81,3 @@ "lodash": "^4.17.21",
   },
-  "gitHead": "fbffbd87f4c9be6a3469f0f2293bf7d928734a7b"
+  "gitHead": "8478175628629cc2db6991ff0c0088959a979e5f"
 }

src/Config.ts

@@ -36,2 +36,3 @@ import { Blueprint, Schemas } from '@boost/common';
 	override bootstrap() {
+		this.configureFinder({ errorIfNoRootFound: true });
 		this.addProcessHandler('drivers', mergePlugins);
@@ -38,0 +39,0 @@ this.addProcessHandler('scripts', mergePlugins);

src/routines/CreateConfigRoutine.ts

@@ -83,3 +83,3 @@ /* eslint-disable @typescript-eslint/member-ordering */
 
-		return Promise.resolve(new Path());
+		return new Path();
 	}
@@ -282,3 +282,3 @@
 	@Bind()
-	async mergeConfigs(context: Ctx, configs: ConfigObject[]): Promise<ConfigObject> {
+	mergeConfigs(context: Ctx, configs: ConfigObject[]): ConfigObject {
 		const { driver } = this.options;
@@ -296,3 +296,3 @@
 
-		return Promise.resolve(config);
+		return config;
 	}
@@ -337,3 +337,3 @@
 
-		return Promise.resolve(configs);
+		return configs;
 	}
@@ -357,3 +357,3 @@
 
-		return Promise.resolve(configs);
+		return configs;
 	}
@@ -360,0 +360,0 @@

src/routines/driver/ExecuteCommandRoutine.ts

@@ -192,3 +192,3 @@ /* eslint-disable @typescript-eslint/member-ordering */
 
-			return Promise.resolve(nativeOptions);
+			return nativeOptions;
 		}
@@ -195,0 +195,0 @@

src/routines/ScaffoldRoutine.ts

@@ -45,2 +45,3 @@ /* eslint-disable no-console, @typescript-eslint/member-ordering */
 				debug: tool.config.debug,
+				// eslint-disable-next-line @typescript-eslint/no-misused-promises
 				exec: this.handleExec,
@@ -63,4 +64,4 @@ logger: new Logger(console.log),
 	 */
-	private handleExec = (action: string, input: string) =>
-		this.executeCommand(action, [], {
+	private handleExec = async (action: string, input: string) => {
+		await this.executeCommand(action, [], {
 			input,
@@ -70,2 +71,3 @@ preferLocal: true,
 		});
+	};
 
@@ -72,0 +74,0 @@ /**

No alert changes

Improved metrics

Total package byte prevSize

370648

increased by2.97%

Lines of code

7470

increased by3.06%

Dependency changes

• Updated@boost/args@^3.0.1

• Updated@boost/common@^3.2.1

• Updated@boost/config@^3.2.0

• Updated@boost/debug@^3.0.3

• Updated@boost/event@^3.0.1

• Updated@boost/internal@^3.0.1

• Updated@boost/log@^3.0.3

• Updated@boost/module@^3.1.0

• Updated@boost/pipeline@^3.2.2

• Updated@boost/plugin@^3.0.4

• Updated@boost/translate@^3.0.3

• Updatedfast-glob@^3.2.11

• Updatedfs-extra@^10.0.1

• Updatedhygen@^6.1.5