vue 2.7.0-alpha.8 → 2.7.0-alpha.9

package/dist/vue.common.dev.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.0-alpha.8
+ * Vue.js v2.7.0-alpha.9
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
@@ -1444,12 +1444,22 @@ function initSetup(vm) {
                     `return a render function instead.`);
             }
             vm._setupState = setupResult;
-            for (const key in setupResult) {
-                if (!isReserved(key)) {
-                    proxySetupProperty(vm, setupResult, key);
+            // __sfc indicates compiled bindings from <script setup>
+            if (!setupResult.__sfc) {
+                for (const key in setupResult) {
+                    if (!isReserved(key)) {
+                        proxyWithRefUnwrap(vm, setupResult, key);
+                    }
+                    else {
+                        warn$2(`Avoid using variables that start with _ or $ in setup().`);
+                    }
                 }
-                else {
-                    warn$2(`Avoid using variables that start with _ or $ in setup().`);
+            }
+            else {
+                // exposed for compiled render fn
+                const proxy = (vm._setupProxy = {});
+                for (const key in setupResult) {
+                    proxyWithRefUnwrap(proxy, setupResult, key);
                 }
             }
         }
@@ -1458,17 +1468,17 @@ function initSetup(vm) {
         }
     }
 }
-function proxySetupProperty(vm, setupResult, key) {
-    const raw = setupResult[key];
-    const unwrap = isRef(raw);
-    Object.defineProperty(vm, key, {
+function proxyWithRefUnwrap(target, source, key) {
+    let raw = source[key];
+    Object.defineProperty(target, key, {
         enumerable: true,
         configurable: true,
-        get: unwrap ? () => raw.value : () => setupResult[key],
-        set: unwrap ? v => (raw.value = v) : v => (setupResult[key] = v)
+        get: () => (isRef(raw) ? raw.value : raw),
+        set: newVal => isRef(raw) ? (raw.value = newVal) : (raw = source[key] = newVal)
     });
 }
 function createSetupContext(vm) {
+    let exposeCalled = false;
     return {
         get attrs() {
             return initAttrsProxy(vm);
@@ -1477,8 +1487,16 @@ function createSetupContext(vm) {
             return initSlotsProxy(vm);
         },
         emit: bind$1(vm.$emit, vm),
-        expose() {
-            // TODO
+        expose(exposed) {
+            {
+                if (exposeCalled) {
+                    warn$2(`expose() should be called only once per setup().`, vm);
+                }
+                exposeCalled = true;
+            }
+            if (exposed) {
+                Object.keys(exposed).forEach(key => proxyWithRefUnwrap(vm, exposed, key));
+            }
         }
     };
 }
@@ -1552,6 +1570,34 @@ function getContext() {
     }
     const vm = currentInstance;
     return vm._setupContext || (vm._setupContext = createSetupContext(vm));
+}
+/**
+ * Runtime helper for merging default declarations. Imported by compiled code
+ * only.
+ * @internal
+ */
+function mergeDefaults(raw, defaults) {
+    const props = isArray(raw)
+        ? raw.reduce((normalized, p) => ((normalized[p] = {}), normalized), {})
+        : raw;
+    for (const key in defaults) {
+        const opt = props[key];
+        if (opt) {
+            if (isArray(opt) || isFunction(opt)) {
+                props[key] = { type: opt, default: defaults[key] };
+            }
+            else {
+                opt.default = defaults[key];
+            }
+        }
+        else if (opt === null) {
+            props[key] = { default: defaults[key] };
+        }
+        else {
+            warn$2(`props default key "${key}" has no corresponding declaration.`);
+        }
+    }
+    return props;
 }
 
 const sharedPropertyDefinition = {
@@ -4095,8 +4141,8 @@ function doWatch(source, cb, { immediate, deep, flush = 'pre', onTrack, onTrigge
         }
     }
     const warnInvalidSource = (s) => {
-        warn$2(`Invalid watch source: `, s, `A watch source can only be a getter/effect function, a ref, ` +
-            `a reactive object, or an array of these types.`);
+        warn$2(`Invalid watch source: ${s}. A watch source can only be a getter/effect ` +
+            `function, a ref, a reactive object, or an array of these types.`);
     };
     const instance = currentInstance;
     const call = (fn, type, args = null) => invokeWithErrorHandling(fn, null, args, instance, type);
@@ -4536,6 +4582,7 @@ var vca = /*#__PURE__*/Object.freeze({
   getCurrentInstance: getCurrentInstance,
   useSlots: useSlots,
   useAttrs: useAttrs,
+  mergeDefaults: mergeDefaults,
   nextTick: nextTick,
   set: set,
   del: del,
@@ -5192,7 +5239,7 @@ function resolveAsset(options, type, id, warnMissing) {
     // fallback to prototype chain
     const res = assets[id] || assets[camelizedId] || assets[PascalCaseId];
     if (warnMissing && !res) {
-        warn$2('Failed to resolve ' + type.slice(0, -1) + ': ' + id, options);
+        warn$2('Failed to resolve ' + type.slice(0, -1) + ': ' + id);
     }
     return res;
 }
@@ -5729,7 +5776,7 @@ Object.defineProperty(Vue.prototype, '$ssrContext', {
 Object.defineProperty(Vue, 'FunctionalRenderContext', {
     value: FunctionalRenderContext
 });
-Vue.version = '2.7.0-alpha.8';
+Vue.version = '2.7.0-alpha.9';
 
 // these are reserved for web because they are directly compiled away
 // during template compilation
@@ -6878,7 +6925,10 @@ function normalizeDirectives(dirs, vm) {
             dir.modifiers = emptyModifiers;
         }
         res[getRawDirName(dir)] = dir;
-        dir.def = resolveAsset(vm.$options, 'directives', dir.name, true);
+        if (vm._setupState && vm._setupState.__sfc) {
+            dir.def = resolveAsset(vm, '_setupState', 'v-' + dir.name);
+        }
+        dir.def = dir.def || resolveAsset(vm.$options, 'directives', dir.name, true);
     }
     // $flow-disable-line
     return res;
@@ -10609,8 +10659,19 @@ function genElement(el, state) {
             if (!el.plain || (el.pre && state.maybeComponent(el))) {
                 data = genData(el, state);
             }
+            let tag;
+            // check if this is a component in <script setup>
+            const bindings = state.options.bindings;
+            if (bindings && bindings.__isScriptSetup !== false) {
+                tag =
+                    checkBindingType(bindings, el.tag) ||
+                        checkBindingType(bindings, camelize(el.tag)) ||
+                        checkBindingType(bindings, capitalize(camelize(el.tag)));
+            }
+            if (!tag)
+                tag = `'${el.tag}'`;
             const children = el.inlineTemplate ? null : genChildren(el, state, true);
-            code = `_c('${el.tag}'${data ? `,${data}` : '' // data
+            code = `_c(${tag}${data ? `,${data}` : '' // data
             }${children ? `,${children}` : '' // children
             })`;
         }
@@ -10621,6 +10682,12 @@ function genElement(el, state) {
         return code;
     }
 }
+function checkBindingType(bindings, key) {
+    const type = bindings[key];
+    if (type && type.startsWith('setup')) {
+        return key;
+    }
+}
 // hoist static sub-trees out
 function genStatic(el, state) {
     el.staticProcessed = true;