@jsenv/core 28.3.3 → 28.3.6

package/dist/babel_helpers/AsyncGenerator/AsyncGenerator.js

@@ -1,4 +1,5 @@
-import AwaitValue from "../AwaitValue/AwaitValue.js";
+/* @minVersion 7.0.0-beta.0 */
+import OverloadYield from "../overloadYield/overloadYield.js";
 export default function AsyncGenerator(gen) {
   var front, back;
 
@@ -25,11 +26,30 @@ export default function AsyncGenerator(gen) {
     try {
       var result = gen[key](arg);
       var value = result.value;
-      var wrappedAwait = value instanceof AwaitValue;
-      Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) {
-        if (wrappedAwait) {
-          resume(key === "return" ? "return" : "next", arg);
-          return;
+      var overloaded = value instanceof OverloadYield;
+      Promise.resolve(overloaded ? value.v : value).then(function (arg) {
+        if (overloaded) {
+          // Overloaded yield requires calling into the generator twice:
+          //  - first we get the iterator result wrapped in a promise
+          //    (the gen[key](arg) call above)
+          //  - then we await it (the Promise.resolve call above)
+          //  - then we give the result back to the iterator, so that it can:
+          //    * if it was an await, use its result
+          //    * if it was a yield*, possibly return the `done: true` signal
+          //      so that yield* knows that the iterator is finished.
+          //      This needs to happen in the second call, because in the
+          //      first one `done: true` was hidden in the promise and thus
+          //      not visible to the (sync) yield*.
+          //      The other part of this implementation is in asyncGeneratorDelegate.
+          var nextKey = key === "return" ? "return" : "next";
+
+          if (!value.k || arg.done) {
+            // await or end of yield*
+            return resume(nextKey, arg);
+          } else {
+            // yield*, not done
+            arg = gen[nextKey](arg).value;
+          }
         }
 
         settle(result.done ? "return" : "normal", arg);

package/dist/babel_helpers/applyDecs/applyDecs.js

@@ -1,4 +1,9 @@
-/* @minVersion 7.16.6 */
+/* @minVersion 7.17.8 */
+
+/**
+ * NOTE: This is an old version of the helper, used for 2021-12 decorators.
+ * Updates should be done in applyDecs2203.js.
+ */
 
 /**
   Enums are used in this file, but not assigned to vars to avoid non-hoistable values
@@ -14,14 +19,14 @@
   SETTER = 4;
 
   STATIC = 5;
+
+  CLASS = 10; // only used in assertValidReturnValue
 */
-function createMetadataMethodsForProperty(metadataMap, kind, property) {
+function old_createMetadataMethodsForProperty(metadataMap, kind, property, decoratorFinishedRef) {
   return {
-    getMetadata(key) {
-      if (typeof key !== "symbol") {
-        throw new TypeError("Metadata keys must be symbols, received: " + key);
-      }
-
+    getMetadata: function (key) {
+      old_assertNotFinished(decoratorFinishedRef, "getMetadata");
+      old_assertMetadataKey(key);
       var metadataForKey = metadataMap[key];
       if (metadataForKey === void 0) return void 0;
 
@@ -45,12 +50,9 @@ function createMetadataMethodsForProperty(metadataMap, kind, property) {
         return metadataForKey.constructor;
       }
     },
-
-    setMetadata(key, value) {
-      if (typeof key !== "symbol") {
-        throw new TypeError("Metadata keys must be symbols, received: " + key);
-      }
-
+    setMetadata: function (key, value) {
+      old_assertNotFinished(decoratorFinishedRef, "setMetadata");
+      old_assertMetadataKey(key);
       var metadataForKey = metadataMap[key];
 
       if (metadataForKey === void 0) {
@@ -81,11 +83,10 @@ function createMetadataMethodsForProperty(metadataMap, kind, property) {
         metadataForKey.constructor = value;
       }
     }
-
   };
 }
 
-function convertMetadataMapToFinal(obj, metadataMap) {
+function old_convertMetadataMapToFinal(obj, metadataMap) {
   var parentMetadataMap = obj[Symbol.metadata || Symbol.for("Symbol.metadata")];
   var metadataKeys = Object.getOwnPropertySymbols(metadataMap);
   if (metadataKeys.length === 0) return;
@@ -126,14 +127,15 @@ function convertMetadataMapToFinal(obj, metadataMap) {
   obj[Symbol.metadata || Symbol.for("Symbol.metadata")] = metadataMap;
 }
 
-function createAddInitializerMethod(initializers) {
+function old_createAddInitializerMethod(initializers, decoratorFinishedRef) {
   return function addInitializer(initializer) {
-    assertValidInitializer(initializer);
+    old_assertNotFinished(decoratorFinishedRef, "addInitializer");
+    old_assertCallable(initializer, "An initializer");
     initializers.push(initializer);
   };
 }
 
-function memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStatic, isPrivate) {
+function old_memberDec(dec, name, desc, metadataMap, initializers, kind, isStatic, isPrivate, value) {
   var kindStr;
 
   switch (kind) {
@@ -171,11 +173,14 @@ function memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStati
     isStatic: isStatic,
     isPrivate: isPrivate
   };
+  var decoratorFinishedRef = {
+    v: false
+  };
 
   if (kind !== 0
   /* FIELD */
   ) {
-    ctx.addInitializer = createAddInitializerMethod(initializers);
+    ctx.addInitializer = old_createAddInitializerMethod(initializers, decoratorFinishedRef);
   }
 
   var metadataKind, metadataName;
@@ -229,36 +234,86 @@ function memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStati
     metadataName = name;
   }
 
-  return Object.assign(ctx, createMetadataMethodsForProperty(metadataMap, metadataKind, metadataName));
+  try {
+    return dec(value, Object.assign(ctx, old_createMetadataMethodsForProperty(metadataMap, metadataKind, metadataName, decoratorFinishedRef)));
+  } finally {
+    decoratorFinishedRef.v = true;
+  }
+}
+
+function old_assertNotFinished(decoratorFinishedRef, fnName) {
+  if (decoratorFinishedRef.v) {
+    throw new Error("attempted to call " + fnName + " after decoration was finished");
+  }
+}
+
+function old_assertMetadataKey(key) {
+  if (typeof key !== "symbol") {
+    throw new TypeError("Metadata keys must be symbols, received: " + key);
+  }
 }
 
-function assertValidInitializer(initializer) {
-  if (typeof initializer !== "function") {
-    throw new Error("initializers must be functions");
+function old_assertCallable(fn, hint) {
+  if (typeof fn !== "function") {
+    throw new TypeError(hint + " must be a function");
   }
 }
 
-function assertValidReturnValue(kind, value) {
+function old_assertValidReturnValue(kind, value) {
   var type = typeof value;
 
   if (kind === 1
   /* ACCESSOR */
   ) {
     if (type !== "object" || value === null) {
-      throw new Error("accessor decorators must return an object with get, set, or initializer properties or void 0");
+      throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+    }
+
+    if (value.get !== undefined) {
+      old_assertCallable(value.get, "accessor.get");
+    }
+
+    if (value.set !== undefined) {
+      old_assertCallable(value.set, "accessor.set");
+    }
+
+    if (value.init !== undefined) {
+      old_assertCallable(value.init, "accessor.init");
+    }
+
+    if (value.initializer !== undefined) {
+      old_assertCallable(value.initializer, "accessor.initializer");
     }
   } else if (type !== "function") {
+    var hint;
+
     if (kind === 0
     /* FIELD */
     ) {
-      throw new Error("field decorators must return a initializer function or void 0");
+      hint = "field";
+    } else if (kind === 10
+    /* CLASS */
+    ) {
+      hint = "class";
     } else {
-      throw new Error("method decorators must return a function or void 0");
+      hint = "method";
     }
+
+    throw new TypeError(hint + " decorators must return a function or void 0");
+  }
+}
+
+function old_getInit(desc) {
+  var initializer;
+
+  if ((initializer = desc.init) == null && (initializer = desc.initializer) && typeof console !== "undefined") {
+    console.warn(".initializer has been renamed to .init as of March 2022");
   }
+
+  return initializer;
 }
 
-function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers) {
+function old_applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers) {
   var decs = decInfo[0];
   var desc, initializer, value;
 
@@ -316,14 +371,13 @@ function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, met
     value = desc.set;
   }
 
-  var ctx = memberDecCtx(base, name, desc, metadataMap, initializers, kind, isStatic, isPrivate);
   var newValue, get, set;
 
   if (typeof decs === "function") {
-    newValue = decs(value, ctx);
+    newValue = old_memberDec(decs, name, desc, metadataMap, initializers, kind, isStatic, isPrivate, value);
 
     if (newValue !== void 0) {
-      assertValidReturnValue(kind, newValue);
+      old_assertValidReturnValue(kind, newValue);
 
       if (kind === 0
       /* FIELD */
@@ -332,7 +386,7 @@ function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, met
       } else if (kind === 1
       /* ACCESSOR */
       ) {
-        initializer = newValue.initializer;
+        initializer = old_getInit(newValue);
         get = newValue.get || value.get;
         set = newValue.set || value.set;
         value = {
@@ -344,12 +398,12 @@ function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, met
       }
     }
   } else {
-    for (var i = 0; i < decs.length; i++) {
+    for (var i = decs.length - 1; i >= 0; i--) {
       var dec = decs[i];
-      newValue = dec(value, ctx);
+      newValue = old_memberDec(dec, name, desc, metadataMap, initializers, kind, isStatic, isPrivate, value);
 
       if (newValue !== void 0) {
-        assertValidReturnValue(kind, newValue);
+        old_assertValidReturnValue(kind, newValue);
         var newInit;
 
         if (kind === 0
@@ -359,7 +413,7 @@ function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, met
         } else if (kind === 1
         /* ACCESSOR */
         ) {
-          newInit = newValue.initializer;
+          newInit = old_getInit(newValue);
           get = newValue.get || value.get;
           set = newValue.set || value.set;
           value = {
@@ -463,7 +517,7 @@ function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, met
   }
 }
 
-function applyMemberDecs(ret, Class, protoMetadataMap, staticMetadataMap, decInfos) {
+function old_applyMemberDecs(ret, Class, protoMetadataMap, staticMetadataMap, decInfos) {
   var protoInitializers;
   var staticInitializers;
   var existingProtoNonFields = new Map();
@@ -488,22 +542,24 @@ function applyMemberDecs(ret, Class, protoMetadataMap, staticMetadataMap, decInf
       metadataMap = staticMetadataMap;
       kind = kind - 5
       /* STATIC */
-      ;
+      ; // initialize staticInitializers when we see a non-field static member
 
-      if (!staticInitializers) {
-        staticInitializers = [];
+      if (kind !== 0
+      /* FIELD */
+      ) {
+        staticInitializers = staticInitializers || [];
+        initializers = staticInitializers;
       }
-
-      initializers = staticInitializers;
     } else {
       base = Class.prototype;
-      metadataMap = protoMetadataMap;
+      metadataMap = protoMetadataMap; // initialize protoInitializers when we see a non-field member
 
-      if (!protoInitializers) {
-        protoInitializers = [];
+      if (kind !== 0
+      /* FIELD */
+      ) {
+        protoInitializers = protoInitializers || [];
+        initializers = protoInitializers;
       }
-
-      initializers = protoInitializers;
     }
 
     if (kind !== 0
@@ -531,63 +587,62 @@ function applyMemberDecs(ret, Class, protoMetadataMap, staticMetadataMap, decInf
       }
     }
 
-    applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers);
-  }
-
-  if (protoInitializers) {
-    pushInitializers(ret, protoInitializers);
+    old_applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, metadataMap, initializers);
   }
 
-  if (staticInitializers) {
-    pushInitializers(ret, staticInitializers);
-  }
+  old_pushInitializers(ret, protoInitializers);
+  old_pushInitializers(ret, staticInitializers);
 }
 
-function pushInitializers(ret, initializers) {
-  if (initializers.length > 0) {
-    // Slice the array, which means that `addInitializer` can no longer add
-    // additional initializers to the array
-    initializers = initializers.slice();
+function old_pushInitializers(ret, initializers) {
+  if (initializers) {
     ret.push(function (instance) {
       for (var i = 0; i < initializers.length; i++) {
-        initializers[i].call(instance, instance);
+        initializers[i].call(instance);
       }
 
-      return instance;
-    });
-  } else {
-    ret.push(function (instance) {
       return instance;
     });
   }
 }
 
-function applyClassDecs(ret, targetClass, metadataMap, classDecs) {
-  var initializers = [];
-  var newClass = targetClass;
-  var name = targetClass.name;
-  var ctx = Object.assign({
-    kind: "class",
-    name: name,
-    addInitializer: createAddInitializerMethod(initializers)
-  }, createMetadataMethodsForProperty(metadataMap, 0
-  /* CONSTRUCTOR */
-  , name));
-
-  for (var i = 0; i < classDecs.length; i++) {
-    newClass = classDecs[i](newClass, ctx) || newClass;
-  }
+function old_applyClassDecs(ret, targetClass, metadataMap, classDecs) {
+  if (classDecs.length > 0) {
+    var initializers = [];
+    var newClass = targetClass;
+    var name = targetClass.name;
+
+    for (var i = classDecs.length - 1; i >= 0; i--) {
+      var decoratorFinishedRef = {
+        v: false
+      };
 
-  ret.push(newClass);
+      try {
+        var ctx = Object.assign({
+          kind: "class",
+          name: name,
+          addInitializer: old_createAddInitializerMethod(initializers, decoratorFinishedRef)
+        }, old_createMetadataMethodsForProperty(metadataMap, 0
+        /* CONSTRUCTOR */
+        , name, decoratorFinishedRef));
+        var nextNewClass = classDecs[i](newClass, ctx);
+      } finally {
+        decoratorFinishedRef.v = true;
+      }
 
-  if (initializers.length > 0) {
-    ret.push(function () {
+      if (nextNewClass !== undefined) {
+        old_assertValidReturnValue(10
+        /* CLASS */
+        , nextNewClass);
+        newClass = nextNewClass;
+      }
+    }
+
+    ret.push(newClass, function () {
       for (var i = 0; i < initializers.length; i++) {
-        initializers[i].call(newClass, newClass);
+        initializers[i].call(newClass);
       }
     });
-  } else {
-    ret.push(function () {});
   }
 }
 /**
@@ -740,17 +795,10 @@ function applyClassDecs(ret, targetClass, metadataMap, classDecs) {
 export default function applyDecs(targetClass, memberDecs, classDecs) {
   var ret = [];
   var staticMetadataMap = {};
-
-  if (memberDecs) {
-    var protoMetadataMap = {};
-    applyMemberDecs(ret, targetClass, protoMetadataMap, staticMetadataMap, memberDecs);
-    convertMetadataMapToFinal(targetClass.prototype, protoMetadataMap);
-  }
-
-  if (classDecs) {
-    applyClassDecs(ret, targetClass, staticMetadataMap, classDecs);
-  }
-
-  convertMetadataMapToFinal(targetClass, staticMetadataMap);
+  var protoMetadataMap = {};
+  old_applyMemberDecs(ret, targetClass, protoMetadataMap, staticMetadataMap, memberDecs);
+  old_convertMetadataMapToFinal(targetClass.prototype, protoMetadataMap);
+  old_applyClassDecs(ret, targetClass, staticMetadataMap, classDecs);
+  old_convertMetadataMapToFinal(targetClass, staticMetadataMap);
   return ret;
 }