@vue/composition-api - npm Package Compare versions

Comparing version 0.3.0 to 0.3.1

CHANGELOG.md

@@ -0,5 +1,10 @@
+# 0.3.1
+
+- Fix cleaup callback not running when watcher stops [#113](https://github.com/vuejs/composition-api/issues/113).
+- Fix watcher callback not flushing at right timing [#120](https://github.com/vuejs/composition-api/issues/120).
+
 # 0.3.0
 
 - Improve TypeScript type definitions.
-- Fix `context.slots` not being avaliable before render [#84](https://github.com/vuejs/composition-api/issues/81).
+- Fix `context.slots` not being avaliable before render [#84](https://github.com/vuejs/composition-api/issues/84).
 
@@ -6,0 +11,0 @@ ## Changed

dist/apis/watch.d.ts

@@ -16,2 +16,7 @@ import { Ref } from '../reactivity';
 }
+export interface VueWatcher {
+    lazy: boolean;
+    get(): any;
+    teardown(): void;
+}
 export declare function watch<T = any>(source: SimpleEffect, options?: Omit<Partial<WatcherOption>, 'lazy'>): StopHandle;
@@ -18,0 +23,0 @@ export declare function watch<T = any>(source: WatcherSource<T>, cb: WatcherCallBack<T>, options?: Partial<WatcherOption>): StopHandle;

dist/component/component.d.ts

@@ -9,3 +9,3 @@ import Vue, { VueConstructor, VNode, ComponentOptions as Vue2ComponentOptions } from 'vue';
 export declare type ComponentInstance = InstanceType<VueConstructor>;
-declare type ComponentRenderProxy<P = {}, S = {}, PublicProps = P> = {
+export declare type ComponentRenderProxy<P = {}, S = {}, PublicProps = P> = {
     $data: S;
@@ -12,0 +12,0 @@ $props: PublicProps;

dist/component/index.d.ts

@@ -1,2 +0,2 @@
-export { Data, createComponent, SetupFunction, SetupContext, ComponentInstance } from './component';
+export { Data, createComponent, SetupFunction, SetupContext, ComponentInstance, ComponentRenderProxy, } from './component';
 export { PropType, PropOptions } from './componentProps';

dist/index.d.ts

@@ -14,3 +14,3 @@ import Vue, { VueConstructor } from 'vue';
 export { SetupContext };
-export { createComponent, PropType, PropOptions } from './component';
+export { createComponent, ComponentRenderProxy, PropType, PropOptions } from './component';
 export * from './apis/state';
@@ -17,0 +17,0 @@ export * from './apis/lifecycle';

dist/vue-composition-api.js

@@ -470,2 +470,8 @@ 'use strict';
 
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
 function set$1(vm, key, value) {
@@ -522,4 +528,5 @@ var state = (vm.__secret_vfa_state__ = vm.__secret_vfa_state__ || {});
         var key = oldRefKeys[index];
-        if (!refs[key]) {
-            rawBindings[key].value = null;
+        var setupValue = rawBindings[key];
+        if (!refs[key] && setupValue && isRef(setupValue)) {
+            setupValue.value = null;
         }
@@ -621,3 +628,5 @@ }
             initSetup(vm, vm.$props);
-            return typeof data === 'function' ? data.call(vm, vm) : data || {};
+            return typeof data === 'function'
+                ? data.call(vm, vm)
+                : data || {};
         };
@@ -818,4 +827,17 @@ }
 }
+function createVueWatcher(vm, getter, callback, options) {
+    var index = vm._watchers.length;
+    // @ts-ignore: use undocumented options
+    vm.$watch(getter, callback, {
+        immediate: options.immediateInvokeCallback,
+        deep: options.deep,
+        lazy: options.noRun,
+        sync: options.sync,
+        before: options.before,
+    });
+    return vm._watchers[index];
+}
 function createWatcher(vm, source, cb, options) {
     var flushMode = options.flush;
+    var isSync = flushMode === 'sync';
     var cleanup;
@@ -832,42 +854,45 @@ var registerCleanup = function (fn) {
     };
+    // cleanup before running getter again
+    var runCleanup = function () {
+        if (cleanup) {
+            cleanup();
+            cleanup = null;
+        }
+    };
+    var createScheduler = function (fn) {
+        if (isSync || /* without a current active instance, ignore pre|post mode */ vm === fallbackVM) {
+            return fn;
+        }
+        return (function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return queueFlushJob(vm, function () {
+                fn.apply(void 0, __spread(args));
+            }, flushMode);
+        });
+    };
     // effect watch
     if (cb === null) {
         var getter_1 = function () { return source(registerCleanup); };
-        // cleanup before running getter again
-        var runBefore_1 = function () {
-            if (cleanup) {
-                cleanup();
-            }
-        };
-        if (flushMode === 'sync') {
-            return vm.$watch(getter_1, noopFn, {
-                immediate: true,
-                deep: options.deep,
-                // @ts-ignore
-                sync: true,
-                before: runBefore_1,
-            });
+        var watcher_1 = createVueWatcher(vm, getter_1, noopFn, {
+            noRun: true,
+            deep: options.deep,
+            sync: isSync,
+            before: runCleanup,
+        });
+        // enable the watcher update
+        watcher_1.lazy = false;
+        var originGet = watcher_1.get.bind(watcher_1);
+        if (isSync) {
+            watcher_1.get();
         }
-        var stopRef_1;
-        var hasEnded_1 = false;
-        var doWatch = function () {
-            if (hasEnded_1)
-                return;
-            stopRef_1 = vm.$watch(getter_1, noopFn, {
-                immediate: false,
-                deep: options.deep,
-                // @ts-ignore
-                before: runBefore_1,
-            });
-        };
-        /* without a current active instance, ignore pre|post mode */
-        if (vm === fallbackVM) {
-            vm.$nextTick(doWatch);
-        }
         else {
-            queueFlushJob(vm, doWatch, flushMode);
+            vm.$nextTick(originGet);
         }
+        watcher_1.get = createScheduler(originGet);
         return function () {
-            hasEnded_1 = true;
-            stopRef_1 && stopRef_1();
+            watcher_1.teardown();
+            runCleanup();
         };
@@ -887,28 +912,28 @@ }
         // cleanup before running cb again
-        if (cleanup) {
-            cleanup();
-        }
+        runCleanup();
         cb(n, o, registerCleanup);
     };
-    var callback = flushMode === 'sync' ||
-        /* without a current active instance, ignore pre|post mode */
-        vm === fallbackVM
-        ? applyCb
-        : function (n, o) {
-            return queueFlushJob(vm, function () {
-                applyCb(n, o);
-            }, flushMode);
+    var callback = createScheduler(applyCb);
+    if (!options.lazy) {
+        var originalCallbck_1 = callback;
+        // `shiftCallback` is used to handle the first sync effect run.
+        // The subsequent callbacks will redirect to `callback`.
+        var shiftCallback_1 = function (n, o) {
+            shiftCallback_1 = originalCallbck_1;
+            applyCb(n, o);
         };
-    // `shiftCallback` is used to handle dirty sync effect.
-    // The subsequent callbacks will redirect to `callback`.
-    var shiftCallback = function (n, o) {
-        shiftCallback = callback;
-        applyCb(n, o);
-    };
-    return vm.$watch(getter, options.lazy ? callback : shiftCallback, {
+        callback = function (n, o) {
+            shiftCallback_1(n, o);
+        };
+    }
+    // @ts-ignore: use undocumented option "sync"
+    var stop = vm.$watch(getter, callback, {
         immediate: !options.lazy,
         deep: options.deep,
-        // @ts-ignore
-        sync: flushMode === 'sync',
+        sync: isSync,
     });
+    return function () {
+        stop();
+        runCleanup();
+    };
 }
@@ -915,0 +940,0 @@ function watch(source, cb, options) {

dist/vue-composition-api.min.js

@@ -1,1 +0,1 @@
-"use strict";function _interopDefault(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var Vue=_interopDefault(require("vue")),toString=function(e){return Object.prototype.toString.call(e)},hasSymbol="function"==typeof Symbol&&Symbol.for,noopFn=function(e){return e},sharedPropertyDefinition={enumerable:!0,configurable:!0,get:noopFn,set:noopFn};function proxy(e,t,n){var r=n.get,o=n.set;sharedPropertyDefinition.get=r||noopFn,sharedPropertyDefinition.set=o||noopFn,Object.defineProperty(e,t,sharedPropertyDefinition)}function def(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var hasOwnProperty=Object.prototype.hasOwnProperty;function hasOwn(e,t){return hasOwnProperty.call(e,t)}function assert(e,t){if(!e)throw new Error("[vue-composition-api] "+t)}function isArray(e){return Array.isArray(e)}function isPlainObject(e){return"[object Object]"===toString(e)}function isFunction(e){return"function"==typeof e}function warn(e,t){Vue.util.warn(e,t)}function logError(e,t,n){if("undefined"==typeof window||"undefined"==typeof console)throw e;console.error(e)}var currentVue=null,currentVM=null;function getCurrentVue(){return currentVue}function setCurrentVue(e){currentVue=e}function getCurrentVM(){return currentVM}function setCurrentVM(e){currentVM=e}function ensureCurrentVMInFn(e){return getCurrentVM()}function createComponentInstance(e,t){void 0===t&&(t={});var n=e.config.silent;e.config.silent=!0;var r=new e(t);return e.config.silent=n,r}function isComponentInstance(e){return currentVue&&e instanceof currentVue}function createSlotProxy(e,t){return function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];return e.$scopedSlots[t]?e.$scopedSlots[t].apply(e,n):warn("slots."+t+'() got called outside of the "render()" scope',e)}}function resolveSlots(e,t){var n;if(e){if(e._normalized)return e._normalized;for(var r in n={},e)e[r]&&"$"!==r[0]&&(n[r]=!0)}else n={};for(var r in t)r in n||(n[r]=!0);return n}function createSymbol(e){return hasSymbol?Symbol.for(e):e}var WatcherPreFlushQueueKey=createSymbol("vfa.key.preFlushQueue"),WatcherPostFlushQueueKey=createSymbol("vfa.key.postFlushQueue"),AccessControlIdentifierKey=createSymbol("vfa.key.accessControlIdentifier"),ReactiveIdentifierKey=createSymbol("vfa.key.reactiveIdentifier"),NonReactiveIdentifierKey=createSymbol("vfa.key.nonReactiveIdentifier"),RefKey="vfa.key.refKey",RefImpl=function(){return function(e){proxy(this,"value",{get:e.get,set:e.set})}}();function createRef(e){return Object.seal(new RefImpl(e))}function ref(e){var t,n=reactive(((t={})[RefKey]=e,t));return createRef({get:function(){return n[RefKey]},set:function(e){return n[RefKey]=e}})}function isRef(e){return e instanceof RefImpl}function toRefs(e){if(!isPlainObject(e))return e;var t={};return Object.keys(e).forEach(function(n){var r=e[n];isRef(r)||(r=createRef({get:function(){return e[n]},set:function(t){return e[n]=t}})),t[n]=r}),t}var AccessControlIdentifier={},ReactiveIdentifier={},NonReactiveIdentifier={};function isNonReactive(e){return hasOwn(e,NonReactiveIdentifierKey)&&e[NonReactiveIdentifierKey]===NonReactiveIdentifier}function isReactive(e){return hasOwn(e,ReactiveIdentifierKey)&&e[ReactiveIdentifierKey]===ReactiveIdentifier}function setupAccessControl(e){if(!(!isPlainObject(e)||isNonReactive(e)||Array.isArray(e)||isRef(e)||isComponentInstance(e)||hasOwn(e,AccessControlIdentifierKey)&&e[AccessControlIdentifierKey]===AccessControlIdentifier)){Object.isExtensible(e)&&def(e,AccessControlIdentifierKey,AccessControlIdentifier);for(var t=Object.keys(e),n=0;n<t.length;n++)defineAccessControl(e,t[n])}}function defineAccessControl(e,t,n){if("__ob__"!==t){var r,o,i=Object.getOwnPropertyDescriptor(e,t);if(i){if(!1===i.configurable)return;r=i.get,o=i.set,r&&!o||2!==arguments.length||(n=e[t])}setupAccessControl(n),Object.defineProperty(e,t,{enumerable:!0,configurable:!0,get:function(){var o=r?r.call(e):n;return t!==RefKey&&isRef(o)?o.value:o},set:function(i){if(!r||o){var a=r?r.call(e):n;t!==RefKey&&isRef(a)&&!isRef(i)?a.value=i:o?o.call(e,i):isRef(i)&&(n=i),setupAccessControl(i)}}})}}function observe(e){var t,n=getCurrentVue();n.observable?t=n.observable(e):t=createComponentInstance(n,{data:{$$state:e}})._data.$$state;return t}function reactive(e){if(!isPlainObject(e)||isReactive(e)||isNonReactive(e)||!Object.isExtensible(e))return e;var t=observe(e);return def(t,ReactiveIdentifierKey,ReactiveIdentifier),setupAccessControl(t),t}function nonReactive(e){return isPlainObject(e)?(e.__ob__=observe({}).__ob__,def(e,NonReactiveIdentifierKey,NonReactiveIdentifier),e):e}function isValidArrayIndex(e){var t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}function set(e,t,n){var r=getCurrentVue().util,o=(r.warn,r.defineReactive);if(isArray(e)&&isValidArrayIndex(t))return e.length=Math.max(e.length,t),e.splice(t,1,n),n;if(t in e&&!(t in Object.prototype))return e[t]=n,n;var i=e.__ob__;return e._isVue||i&&i.vmCount?n:i?(o(i.value,t,n),defineAccessControl(e,t,n),i.dep.notify(),n):(e[t]=n,n)}function mergeData(e,t){if(!t)return e;for(var n,r,o,i=hasSymbol?Reflect.ownKeys(t):Object.keys(t),a=0;a<i.length;a++)"__ob__"!==(n=i[a])&&(r=e[n],o=t[n],hasOwn(e,n)?r!==o&&isPlainObject(r)&&!isRef(r)&&isPlainObject(o)&&!isRef(r)&&mergeData(r,o):e[n]=o);return e}function install(e,t){currentVue&&currentVue===e||(e.config.optionMergeStrategies.setup=function(e,t){return function(n,r){return mergeData("function"==typeof t&&t(n,r)||{},"function"==typeof e&&e(n,r)||{})}},setCurrentVue(e),t(e))}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function __read(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a}function set$1(e,t,n){(e.__secret_vfa_state__=e.__secret_vfa_state__||{})[t]=n}function get(e,t){return(e.__secret_vfa_state__||{})[t]}var fallbackCreateElement,vmStateManager={set:set$1,get:get};function asVmProperty(e,t,n){var r=e.$options.props;t in e||r&&hasOwn(r,t)||proxy(e,t,{get:function(){return n.value},set:function(e){n.value=e}})}function updateTemplateRef(e){var t=vmStateManager.get(e,"rawBindings")||{};if(t&&Object.keys(t).length){for(var n=e.$refs,r=vmStateManager.get(e,"refs")||[],o=0;o<r.length;o++){n[u=r[o]]||(t[u].value=null)}var i=Object.keys(n),a=[];for(o=0;o<i.length;o++){var u,c=t[u=i[o]];n[u]&&c&&isRef(c)&&(c.value=n[u],a.push(u))}vmStateManager.set(e,"refs",a)}}function resolveScopedSlots(e,t){var n=e.$options._parentVnode;if(n){for(var r=vmStateManager.get(e,"slots")||[],o=resolveSlots(n.data.scopedSlots,e.$slots),i=0;i<r.length;i++){o[u=r[i]]||delete t[u]}var a=Object.keys(o);for(i=0;i<a.length;i++){var u;t[u=a[i]]||(t[u]=createSlotProxy(e,u))}vmStateManager.set(e,"slots",a)}}function activateCurrentInstance(e,t,n){var r=getCurrentVM();setCurrentVM(e);try{return t(e)}catch(e){if(!n)throw e;n(e)}finally{setCurrentVM(r)}}function mixin(e){e.mixin({beforeCreate:function(){var e=this,t=e.$options,n=t.setup,r=t.render;r&&(t.render=function(){for(var t=this,n=[],o=0;o<arguments.length;o++)n[o]=arguments[o];return activateCurrentInstance(e,function(){return r.apply(t,n)})});if(!n)return;if("function"!=typeof n)return;var o=t.data;t.data=function(){return function(e,t){void 0===t&&(t={});var n,r=e.$options.setup,o=function(e){var t={slots:{}};return["root","parent","refs","attrs"].forEach(function(n){var r,o,i;Array.isArray(n)?(r=__read(n,2),o=r[0],i=r[1]):o=i=n,i="$"+i,proxy(t,o,{get:function(){return e[i]},set:function(){warn("Cannot assign to '"+o+"' because it is a read-only property",e)}})}),["emit"].forEach(function(n){var r="$"+n;proxy(t,n,{get:function(){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];e[r].apply(e,t)}}})}),t}(e);if(resolveScopedSlots(e,o.slots),activateCurrentInstance(e,function(){n=r(t,o)}),!n)return;if(isFunction(n)){var i=n;return void(e.$options.render=function(){return resolveScopedSlots(e,o.slots),activateCurrentInstance(e,function(){return i()})})}if(isPlainObject(n)){var a=n;vmStateManager.set(e,"rawBindings",n),Object.keys(n).forEach(function(t){var n=a[t];isRef(n)||(n=isReactive(n)?ref(n):ref(nonReactive(n))),asVmProperty(e,t,n)})}}(e,e.$props),"function"==typeof o?o.call(e,e):o||{}}},mounted:function(){updateTemplateRef(this)},updated:function(){updateTemplateRef(this)}})}var createElement=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return currentVM?currentVM.$createElement.apply(currentVM,e):(warn("`createElement()` has been called outside of render function."),fallbackCreateElement||(fallbackCreateElement=createComponentInstance(getCurrentVue()).$createElement),fallbackCreateElement.apply(fallbackCreateElement,e))};function createComponent(e){return e}var genName=function(e){return"on"+(e[0].toUpperCase()+e.slice(1))};function createLifeCycle(e){return function(t){var n=ensureCurrentVMInFn(genName(e));injectHookOption(getCurrentVue(),n,e,t)}}function createLifeCycles(e,t){return function(n){var r=getCurrentVue(),o=ensureCurrentVMInFn(t);e.forEach(function(e){return injectHookOption(r,o,e,n)})}}function injectHookOption(e,t,n,r){var o=t.$options,i=e.config.optionMergeStrategies[n];o[n]=i(o[n],r)}var fallbackVM,onBeforeMount=createLifeCycle("beforeMount"),onMounted=createLifeCycle("mounted"),onBeforeUpdate=createLifeCycle("beforeUpdate"),onUpdated=createLifeCycle("updated"),onBeforeUnmount=createLifeCycle("beforeDestroy"),onUnmounted=createLifeCycles(["destroyed","deactivated"],genName("unmounted")),onErrorCaptured=createLifeCycle("errorCaptured"),onActivated=createLifeCycle("activated"),onDeactivated=createLifeCycle("deactivated");function flushPreQueue(){flushQueue(this,WatcherPreFlushQueueKey)}function flushPostQueue(){flushQueue(this,WatcherPostFlushQueueKey)}function hasWatchEnv(e){return void 0!==e[WatcherPreFlushQueueKey]}function installWatchEnv(e){e[WatcherPreFlushQueueKey]=[],e[WatcherPostFlushQueueKey]=[],e.$on("hook:beforeUpdate",flushPreQueue),e.$on("hook:updated",flushPostQueue)}function flushQueue(e,t){for(var n=e[t],r=0;r<n.length;r++)n[r]();n.length=0}function queueFlushJob(e,t,n){var r=function(){e.$nextTick(function(){e[WatcherPreFlushQueueKey].length&&flushQueue(e,WatcherPreFlushQueueKey),e[WatcherPostFlushQueueKey].length&&flushQueue(e,WatcherPostFlushQueueKey)})};switch(n){case"pre":r(),e[WatcherPreFlushQueueKey].push(t);break;case"post":r(),e[WatcherPostFlushQueueKey].push(t);break;default:assert(!1,'flush must be one of ["post", "pre", "sync"], but got '+n)}}function createWatcher(e,t,n,r){var o,i,a=r.flush,u=function(t){o=function(){try{t()}catch(t){logError(t,e,"onCleanup()")}}};if(null===n){var c,f=function(){return t(u)},s=function(){o&&o()};if("sync"===a)return e.$watch(f,noopFn,{immediate:!0,deep:r.deep,sync:!0,before:s});var l=!1,p=function(){l||(c=e.$watch(f,noopFn,{immediate:!1,deep:r.deep,before:s}))};return e===fallbackVM?e.$nextTick(p):queueFlushJob(e,p,a),function(){l=!0,c&&c()}}i=Array.isArray(t)?function(){return t.map(function(e){return isRef(e)?e.value:e()})}:isRef(t)?function(){return t.value}:t;var v=function(e,t){o&&o(),n(e,t,u)},d="sync"===a||e===fallbackVM?v:function(t,n){return queueFlushJob(e,function(){v(t,n)},a)},y=function(e,t){y=d,v(e,t)};return e.$watch(i,r.lazy?d:y,{immediate:!r.lazy,deep:r.deep,sync:"sync"===a})}function watch(e,t,n){var r=null;"function"==typeof t?r=t:(n=t,r=null);var o=__assign({lazy:!1,deep:!1,flush:"post"},n),i=getCurrentVM();return i?hasWatchEnv(i)||installWatchEnv(i):(fallbackVM||(fallbackVM=createComponentInstance(getCurrentVue())),i=fallbackVM),createWatcher(i,e,r,o)}function computed(e){var t,n;"function"==typeof e?t=e:(t=e.get,n=e.set);var r=createComponentInstance(getCurrentVue(),{computed:{$$state:{get:t,set:n}}});return createRef({get:function(){return r.$$state},set:function(e){r.$$state=e}})}var NOT_FOUND={};function resolveInject(e,t){for(var n=t;n;){if(n._provided&&hasOwn(n._provided,e))return n._provided[e];n=n.$parent}return NOT_FOUND}function provide(e,t){var n=ensureCurrentVMInFn("provide");if(!n._provided){var r={};Object.defineProperty(n,"_provided",{get:function(){return r},set:function(e){return Object.assign(r,e)}})}n._provided[e]=t}function inject(e,t){if(!e)return t;var n=resolveInject(e,ensureCurrentVMInFn("inject"));return n!==NOT_FOUND?n:void 0!==t?t:void 0}var _install=function(e){return install(e,mixin)},plugin={install:_install};currentVue&&"undefined"!=typeof window&&window.Vue&&_install(window.Vue),exports.computed=computed,exports.createComponent=createComponent,exports.createElement=createElement,exports.default=plugin,exports.inject=inject,exports.isRef=isRef,exports.onActivated=onActivated,exports.onBeforeMount=onBeforeMount,exports.onBeforeUnmount=onBeforeUnmount,exports.onBeforeUpdate=onBeforeUpdate,exports.onDeactivated=onDeactivated,exports.onErrorCaptured=onErrorCaptured,exports.onMounted=onMounted,exports.onUnmounted=onUnmounted,exports.onUpdated=onUpdated,exports.provide=provide,exports.reactive=reactive,exports.ref=ref,exports.set=set,exports.toRefs=toRefs,exports.watch=watch;
+"use strict";function _interopDefault(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var Vue=_interopDefault(require("vue")),toString=function(e){return Object.prototype.toString.call(e)},hasSymbol="function"==typeof Symbol&&Symbol.for,noopFn=function(e){return e},sharedPropertyDefinition={enumerable:!0,configurable:!0,get:noopFn,set:noopFn};function proxy(e,t,n){var r=n.get,o=n.set;sharedPropertyDefinition.get=r||noopFn,sharedPropertyDefinition.set=o||noopFn,Object.defineProperty(e,t,sharedPropertyDefinition)}function def(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var hasOwnProperty=Object.prototype.hasOwnProperty;function hasOwn(e,t){return hasOwnProperty.call(e,t)}function assert(e,t){if(!e)throw new Error("[vue-composition-api] "+t)}function isArray(e){return Array.isArray(e)}function isPlainObject(e){return"[object Object]"===toString(e)}function isFunction(e){return"function"==typeof e}function warn(e,t){Vue.util.warn(e,t)}function logError(e,t,n){if("undefined"==typeof window||"undefined"==typeof console)throw e;console.error(e)}var currentVue=null,currentVM=null;function getCurrentVue(){return currentVue}function setCurrentVue(e){currentVue=e}function getCurrentVM(){return currentVM}function setCurrentVM(e){currentVM=e}function ensureCurrentVMInFn(e){return getCurrentVM()}function createComponentInstance(e,t){void 0===t&&(t={});var n=e.config.silent;e.config.silent=!0;var r=new e(t);return e.config.silent=n,r}function isComponentInstance(e){return currentVue&&e instanceof currentVue}function createSlotProxy(e,t){return function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];return e.$scopedSlots[t]?e.$scopedSlots[t].apply(e,n):warn("slots."+t+'() got called outside of the "render()" scope',e)}}function resolveSlots(e,t){var n;if(e){if(e._normalized)return e._normalized;for(var r in n={},e)e[r]&&"$"!==r[0]&&(n[r]=!0)}else n={};for(var r in t)r in n||(n[r]=!0);return n}function createSymbol(e){return hasSymbol?Symbol.for(e):e}var WatcherPreFlushQueueKey=createSymbol("vfa.key.preFlushQueue"),WatcherPostFlushQueueKey=createSymbol("vfa.key.postFlushQueue"),AccessControlIdentifierKey=createSymbol("vfa.key.accessControlIdentifier"),ReactiveIdentifierKey=createSymbol("vfa.key.reactiveIdentifier"),NonReactiveIdentifierKey=createSymbol("vfa.key.nonReactiveIdentifier"),RefKey="vfa.key.refKey",RefImpl=function(){return function(e){proxy(this,"value",{get:e.get,set:e.set})}}();function createRef(e){return Object.seal(new RefImpl(e))}function ref(e){var t,n=reactive(((t={})[RefKey]=e,t));return createRef({get:function(){return n[RefKey]},set:function(e){return n[RefKey]=e}})}function isRef(e){return e instanceof RefImpl}function toRefs(e){if(!isPlainObject(e))return e;var t={};return Object.keys(e).forEach(function(n){var r=e[n];isRef(r)||(r=createRef({get:function(){return e[n]},set:function(t){return e[n]=t}})),t[n]=r}),t}var AccessControlIdentifier={},ReactiveIdentifier={},NonReactiveIdentifier={};function isNonReactive(e){return hasOwn(e,NonReactiveIdentifierKey)&&e[NonReactiveIdentifierKey]===NonReactiveIdentifier}function isReactive(e){return hasOwn(e,ReactiveIdentifierKey)&&e[ReactiveIdentifierKey]===ReactiveIdentifier}function setupAccessControl(e){if(!(!isPlainObject(e)||isNonReactive(e)||Array.isArray(e)||isRef(e)||isComponentInstance(e)||hasOwn(e,AccessControlIdentifierKey)&&e[AccessControlIdentifierKey]===AccessControlIdentifier)){Object.isExtensible(e)&&def(e,AccessControlIdentifierKey,AccessControlIdentifier);for(var t=Object.keys(e),n=0;n<t.length;n++)defineAccessControl(e,t[n])}}function defineAccessControl(e,t,n){if("__ob__"!==t){var r,o,a=Object.getOwnPropertyDescriptor(e,t);if(a){if(!1===a.configurable)return;r=a.get,o=a.set,r&&!o||2!==arguments.length||(n=e[t])}setupAccessControl(n),Object.defineProperty(e,t,{enumerable:!0,configurable:!0,get:function(){var o=r?r.call(e):n;return t!==RefKey&&isRef(o)?o.value:o},set:function(a){if(!r||o){var i=r?r.call(e):n;t!==RefKey&&isRef(i)&&!isRef(a)?i.value=a:o?o.call(e,a):isRef(a)&&(n=a),setupAccessControl(a)}}})}}function observe(e){var t,n=getCurrentVue();n.observable?t=n.observable(e):t=createComponentInstance(n,{data:{$$state:e}})._data.$$state;return t}function reactive(e){if(!isPlainObject(e)||isReactive(e)||isNonReactive(e)||!Object.isExtensible(e))return e;var t=observe(e);return def(t,ReactiveIdentifierKey,ReactiveIdentifier),setupAccessControl(t),t}function nonReactive(e){return isPlainObject(e)?(e.__ob__=observe({}).__ob__,def(e,NonReactiveIdentifierKey,NonReactiveIdentifier),e):e}function isValidArrayIndex(e){var t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}function set(e,t,n){var r=getCurrentVue().util,o=(r.warn,r.defineReactive);if(isArray(e)&&isValidArrayIndex(t))return e.length=Math.max(e.length,t),e.splice(t,1,n),n;if(t in e&&!(t in Object.prototype))return e[t]=n,n;var a=e.__ob__;return e._isVue||a&&a.vmCount?n:a?(o(a.value,t,n),defineAccessControl(e,t,n),a.dep.notify(),n):(e[t]=n,n)}function mergeData(e,t){if(!t)return e;for(var n,r,o,a=hasSymbol?Reflect.ownKeys(t):Object.keys(t),i=0;i<a.length;i++)"__ob__"!==(n=a[i])&&(r=e[n],o=t[n],hasOwn(e,n)?r!==o&&isPlainObject(r)&&!isRef(r)&&isPlainObject(o)&&!isRef(r)&&mergeData(r,o):e[n]=o);return e}function install(e,t){currentVue&&currentVue===e||(e.config.optionMergeStrategies.setup=function(e,t){return function(n,r){return mergeData("function"==typeof t&&t(n,r)||{},"function"==typeof e&&e(n,r)||{})}},setCurrentVue(e),t(e))}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function __read(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,a=n.call(e),i=[];try{for(;(void 0===t||t-- >0)&&!(r=a.next()).done;)i.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=a.return)&&n.call(a)}finally{if(o)throw o.error}}return i}function __spread(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(__read(arguments[t]));return e}function set$1(e,t,n){(e.__secret_vfa_state__=e.__secret_vfa_state__||{})[t]=n}function get(e,t){return(e.__secret_vfa_state__||{})[t]}var fallbackCreateElement,vmStateManager={set:set$1,get:get};function asVmProperty(e,t,n){var r=e.$options.props;t in e||r&&hasOwn(r,t)||proxy(e,t,{get:function(){return n.value},set:function(e){n.value=e}})}function updateTemplateRef(e){var t=vmStateManager.get(e,"rawBindings")||{};if(t&&Object.keys(t).length){for(var n=e.$refs,r=vmStateManager.get(e,"refs")||[],o=0;o<r.length;o++){var a=t[c=r[o]];!n[c]&&a&&isRef(a)&&(a.value=null)}var i=Object.keys(n),u=[];for(o=0;o<i.length;o++){var c;a=t[c=i[o]];n[c]&&a&&isRef(a)&&(a.value=n[c],u.push(c))}vmStateManager.set(e,"refs",u)}}function resolveScopedSlots(e,t){var n=e.$options._parentVnode;if(n){for(var r=vmStateManager.get(e,"slots")||[],o=resolveSlots(n.data.scopedSlots,e.$slots),a=0;a<r.length;a++){o[u=r[a]]||delete t[u]}var i=Object.keys(o);for(a=0;a<i.length;a++){var u;t[u=i[a]]||(t[u]=createSlotProxy(e,u))}vmStateManager.set(e,"slots",i)}}function activateCurrentInstance(e,t,n){var r=getCurrentVM();setCurrentVM(e);try{return t(e)}catch(e){if(!n)throw e;n(e)}finally{setCurrentVM(r)}}function mixin(e){e.mixin({beforeCreate:function(){var e=this,t=e.$options,n=t.setup,r=t.render;r&&(t.render=function(){for(var t=this,n=[],o=0;o<arguments.length;o++)n[o]=arguments[o];return activateCurrentInstance(e,function(){return r.apply(t,n)})});if(!n)return;if("function"!=typeof n)return;var o=t.data;t.data=function(){return function(e,t){void 0===t&&(t={});var n,r=e.$options.setup,o=function(e){var t={slots:{}};return["root","parent","refs","attrs"].forEach(function(n){var r,o,a;Array.isArray(n)?(r=__read(n,2),o=r[0],a=r[1]):o=a=n,a="$"+a,proxy(t,o,{get:function(){return e[a]},set:function(){warn("Cannot assign to '"+o+"' because it is a read-only property",e)}})}),["emit"].forEach(function(n){var r="$"+n;proxy(t,n,{get:function(){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];e[r].apply(e,t)}}})}),t}(e);if(resolveScopedSlots(e,o.slots),activateCurrentInstance(e,function(){n=r(t,o)}),!n)return;if(isFunction(n)){var a=n;return void(e.$options.render=function(){return resolveScopedSlots(e,o.slots),activateCurrentInstance(e,function(){return a()})})}if(isPlainObject(n)){var i=n;vmStateManager.set(e,"rawBindings",n),Object.keys(n).forEach(function(t){var n=i[t];isRef(n)||(n=isReactive(n)?ref(n):ref(nonReactive(n))),asVmProperty(e,t,n)})}}(e,e.$props),"function"==typeof o?o.call(e,e):o||{}}},mounted:function(){updateTemplateRef(this)},updated:function(){updateTemplateRef(this)}})}var createElement=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return currentVM?currentVM.$createElement.apply(currentVM,e):(warn("`createElement()` has been called outside of render function."),fallbackCreateElement||(fallbackCreateElement=createComponentInstance(getCurrentVue()).$createElement),fallbackCreateElement.apply(fallbackCreateElement,e))};function createComponent(e){return e}var genName=function(e){return"on"+(e[0].toUpperCase()+e.slice(1))};function createLifeCycle(e){return function(t){var n=ensureCurrentVMInFn(genName(e));injectHookOption(getCurrentVue(),n,e,t)}}function createLifeCycles(e,t){return function(n){var r=getCurrentVue(),o=ensureCurrentVMInFn(t);e.forEach(function(e){return injectHookOption(r,o,e,n)})}}function injectHookOption(e,t,n,r){var o=t.$options,a=e.config.optionMergeStrategies[n];o[n]=a(o[n],r)}var fallbackVM,onBeforeMount=createLifeCycle("beforeMount"),onMounted=createLifeCycle("mounted"),onBeforeUpdate=createLifeCycle("beforeUpdate"),onUpdated=createLifeCycle("updated"),onBeforeUnmount=createLifeCycle("beforeDestroy"),onUnmounted=createLifeCycles(["destroyed","deactivated"],genName("unmounted")),onErrorCaptured=createLifeCycle("errorCaptured"),onActivated=createLifeCycle("activated"),onDeactivated=createLifeCycle("deactivated");function flushPreQueue(){flushQueue(this,WatcherPreFlushQueueKey)}function flushPostQueue(){flushQueue(this,WatcherPostFlushQueueKey)}function hasWatchEnv(e){return void 0!==e[WatcherPreFlushQueueKey]}function installWatchEnv(e){e[WatcherPreFlushQueueKey]=[],e[WatcherPostFlushQueueKey]=[],e.$on("hook:beforeUpdate",flushPreQueue),e.$on("hook:updated",flushPostQueue)}function flushQueue(e,t){for(var n=e[t],r=0;r<n.length;r++)n[r]();n.length=0}function queueFlushJob(e,t,n){var r=function(){e.$nextTick(function(){e[WatcherPreFlushQueueKey].length&&flushQueue(e,WatcherPreFlushQueueKey),e[WatcherPostFlushQueueKey].length&&flushQueue(e,WatcherPostFlushQueueKey)})};switch(n){case"pre":r(),e[WatcherPreFlushQueueKey].push(t);break;case"post":r(),e[WatcherPostFlushQueueKey].push(t);break;default:assert(!1,'flush must be one of ["post", "pre", "sync"], but got '+n)}}function createVueWatcher(e,t,n,r){var o=e._watchers.length;return e.$watch(t,n,{immediate:r.immediateInvokeCallback,deep:r.deep,lazy:r.noRun,sync:r.sync,before:r.before}),e._watchers[o]}function createWatcher(e,t,n,r){var o,a,i=r.flush,u="sync"===i,c=function(t){o=function(){try{t()}catch(t){logError(t,e,"onCleanup()")}}},f=function(){o&&(o(),o=null)},s=function(t){return u||e===fallbackVM?t:function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];return queueFlushJob(e,function(){t.apply(void 0,__spread(n))},i)}};if(null===n){var l=createVueWatcher(e,function(){return t(c)},noopFn,{noRun:!0,deep:r.deep,sync:u,before:f});l.lazy=!1;var p=l.get.bind(l);return u?l.get():e.$nextTick(p),l.get=s(p),function(){l.teardown(),f()}}a=Array.isArray(t)?function(){return t.map(function(e){return isRef(e)?e.value:e()})}:isRef(t)?function(){return t.value}:t;var v=function(e,t){f(),n(e,t,c)},d=s(v);if(!r.lazy){var y=d,h=function(e,t){h=y,v(e,t)};d=function(e,t){h(e,t)}}var g=e.$watch(a,d,{immediate:!r.lazy,deep:r.deep,sync:u});return function(){g(),f()}}function watch(e,t,n){var r=null;"function"==typeof t?r=t:(n=t,r=null);var o=__assign({lazy:!1,deep:!1,flush:"post"},n),a=getCurrentVM();return a?hasWatchEnv(a)||installWatchEnv(a):(fallbackVM||(fallbackVM=createComponentInstance(getCurrentVue())),a=fallbackVM),createWatcher(a,e,r,o)}function computed(e){var t,n;"function"==typeof e?t=e:(t=e.get,n=e.set);var r=createComponentInstance(getCurrentVue(),{computed:{$$state:{get:t,set:n}}});return createRef({get:function(){return r.$$state},set:function(e){r.$$state=e}})}var NOT_FOUND={};function resolveInject(e,t){for(var n=t;n;){if(n._provided&&hasOwn(n._provided,e))return n._provided[e];n=n.$parent}return NOT_FOUND}function provide(e,t){var n=ensureCurrentVMInFn("provide");if(!n._provided){var r={};Object.defineProperty(n,"_provided",{get:function(){return r},set:function(e){return Object.assign(r,e)}})}n._provided[e]=t}function inject(e,t){if(!e)return t;var n=resolveInject(e,ensureCurrentVMInFn("inject"));return n!==NOT_FOUND?n:void 0!==t?t:void 0}var _install=function(e){return install(e,mixin)},plugin={install:_install};currentVue&&"undefined"!=typeof window&&window.Vue&&_install(window.Vue),exports.computed=computed,exports.createComponent=createComponent,exports.createElement=createElement,exports.default=plugin,exports.inject=inject,exports.isRef=isRef,exports.onActivated=onActivated,exports.onBeforeMount=onBeforeMount,exports.onBeforeUnmount=onBeforeUnmount,exports.onBeforeUpdate=onBeforeUpdate,exports.onDeactivated=onDeactivated,exports.onErrorCaptured=onErrorCaptured,exports.onMounted=onMounted,exports.onUnmounted=onUnmounted,exports.onUpdated=onUpdated,exports.provide=provide,exports.reactive=reactive,exports.ref=ref,exports.set=set,exports.toRefs=toRefs,exports.watch=watch;

dist/vue-composition-api.module.js

@@ -464,2 +464,8 @@ import Vue from 'vue';
 
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
 function set$1(vm, key, value) {
@@ -516,4 +522,5 @@ var state = (vm.__secret_vfa_state__ = vm.__secret_vfa_state__ || {});
         var key = oldRefKeys[index];
-        if (!refs[key]) {
-            rawBindings[key].value = null;
+        var setupValue = rawBindings[key];
+        if (!refs[key] && setupValue && isRef(setupValue)) {
+            setupValue.value = null;
         }
@@ -615,3 +622,5 @@ }
             initSetup(vm, vm.$props);
-            return typeof data === 'function' ? data.call(vm, vm) : data || {};
+            return typeof data === 'function'
+                ? data.call(vm, vm)
+                : data || {};
         };
@@ -812,4 +821,17 @@ }
 }
+function createVueWatcher(vm, getter, callback, options) {
+    var index = vm._watchers.length;
+    // @ts-ignore: use undocumented options
+    vm.$watch(getter, callback, {
+        immediate: options.immediateInvokeCallback,
+        deep: options.deep,
+        lazy: options.noRun,
+        sync: options.sync,
+        before: options.before,
+    });
+    return vm._watchers[index];
+}
 function createWatcher(vm, source, cb, options) {
     var flushMode = options.flush;
+    var isSync = flushMode === 'sync';
     var cleanup;
@@ -826,42 +848,45 @@ var registerCleanup = function (fn) {
     };
+    // cleanup before running getter again
+    var runCleanup = function () {
+        if (cleanup) {
+            cleanup();
+            cleanup = null;
+        }
+    };
+    var createScheduler = function (fn) {
+        if (isSync || /* without a current active instance, ignore pre|post mode */ vm === fallbackVM) {
+            return fn;
+        }
+        return (function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return queueFlushJob(vm, function () {
+                fn.apply(void 0, __spread(args));
+            }, flushMode);
+        });
+    };
     // effect watch
     if (cb === null) {
         var getter_1 = function () { return source(registerCleanup); };
-        // cleanup before running getter again
-        var runBefore_1 = function () {
-            if (cleanup) {
-                cleanup();
-            }
-        };
-        if (flushMode === 'sync') {
-            return vm.$watch(getter_1, noopFn, {
-                immediate: true,
-                deep: options.deep,
-                // @ts-ignore
-                sync: true,
-                before: runBefore_1,
-            });
+        var watcher_1 = createVueWatcher(vm, getter_1, noopFn, {
+            noRun: true,
+            deep: options.deep,
+            sync: isSync,
+            before: runCleanup,
+        });
+        // enable the watcher update
+        watcher_1.lazy = false;
+        var originGet = watcher_1.get.bind(watcher_1);
+        if (isSync) {
+            watcher_1.get();
         }
-        var stopRef_1;
-        var hasEnded_1 = false;
-        var doWatch = function () {
-            if (hasEnded_1)
-                return;
-            stopRef_1 = vm.$watch(getter_1, noopFn, {
-                immediate: false,
-                deep: options.deep,
-                // @ts-ignore
-                before: runBefore_1,
-            });
-        };
-        /* without a current active instance, ignore pre|post mode */
-        if (vm === fallbackVM) {
-            vm.$nextTick(doWatch);
-        }
         else {
-            queueFlushJob(vm, doWatch, flushMode);
+            vm.$nextTick(originGet);
         }
+        watcher_1.get = createScheduler(originGet);
         return function () {
-            hasEnded_1 = true;
-            stopRef_1 && stopRef_1();
+            watcher_1.teardown();
+            runCleanup();
         };
@@ -881,28 +906,28 @@ }
         // cleanup before running cb again
-        if (cleanup) {
-            cleanup();
-        }
+        runCleanup();
         cb(n, o, registerCleanup);
     };
-    var callback = flushMode === 'sync' ||
-        /* without a current active instance, ignore pre|post mode */
-        vm === fallbackVM
-        ? applyCb
-        : function (n, o) {
-            return queueFlushJob(vm, function () {
-                applyCb(n, o);
-            }, flushMode);
+    var callback = createScheduler(applyCb);
+    if (!options.lazy) {
+        var originalCallbck_1 = callback;
+        // `shiftCallback` is used to handle the first sync effect run.
+        // The subsequent callbacks will redirect to `callback`.
+        var shiftCallback_1 = function (n, o) {
+            shiftCallback_1 = originalCallbck_1;
+            applyCb(n, o);
         };
-    // `shiftCallback` is used to handle dirty sync effect.
-    // The subsequent callbacks will redirect to `callback`.
-    var shiftCallback = function (n, o) {
-        shiftCallback = callback;
-        applyCb(n, o);
-    };
-    return vm.$watch(getter, options.lazy ? callback : shiftCallback, {
+        callback = function (n, o) {
+            shiftCallback_1(n, o);
+        };
+    }
+    // @ts-ignore: use undocumented option "sync"
+    var stop = vm.$watch(getter, callback, {
         immediate: !options.lazy,
         deep: options.deep,
-        // @ts-ignore
-        sync: flushMode === 'sync',
+        sync: isSync,
     });
+    return function () {
+        stop();
+        runCleanup();
+    };
 }
@@ -909,0 +934,0 @@ function watch(source, cb, options) {

dist/vue-composition-api.umd.js

@@ -470,2 +470,8 @@ (function (global, factory) {
 
+  function __spread() {
+      for (var ar = [], i = 0; i < arguments.length; i++)
+          ar = ar.concat(__read(arguments[i]));
+      return ar;
+  }
+
   function set$1(vm, key, value) {
@@ -522,4 +528,5 @@ var state = (vm.__secret_vfa_state__ = vm.__secret_vfa_state__ || {});
           var key = oldRefKeys[index];
-          if (!refs[key]) {
-              rawBindings[key].value = null;
+          var setupValue = rawBindings[key];
+          if (!refs[key] && setupValue && isRef(setupValue)) {
+              setupValue.value = null;
           }
@@ -621,3 +628,5 @@ }
               initSetup(vm, vm.$props);
-              return typeof data === 'function' ? data.call(vm, vm) : data || {};
+              return typeof data === 'function'
+                  ? data.call(vm, vm)
+                  : data || {};
           };
@@ -818,4 +827,17 @@ }
   }
+  function createVueWatcher(vm, getter, callback, options) {
+      var index = vm._watchers.length;
+      // @ts-ignore: use undocumented options
+      vm.$watch(getter, callback, {
+          immediate: options.immediateInvokeCallback,
+          deep: options.deep,
+          lazy: options.noRun,
+          sync: options.sync,
+          before: options.before,
+      });
+      return vm._watchers[index];
+  }
   function createWatcher(vm, source, cb, options) {
       var flushMode = options.flush;
+      var isSync = flushMode === 'sync';
       var cleanup;
@@ -832,42 +854,45 @@ var registerCleanup = function (fn) {
       };
+      // cleanup before running getter again
+      var runCleanup = function () {
+          if (cleanup) {
+              cleanup();
+              cleanup = null;
+          }
+      };
+      var createScheduler = function (fn) {
+          if (isSync || /* without a current active instance, ignore pre|post mode */ vm === fallbackVM) {
+              return fn;
+          }
+          return (function () {
+              var args = [];
+              for (var _i = 0; _i < arguments.length; _i++) {
+                  args[_i] = arguments[_i];
+              }
+              return queueFlushJob(vm, function () {
+                  fn.apply(void 0, __spread(args));
+              }, flushMode);
+          });
+      };
       // effect watch
       if (cb === null) {
           var getter_1 = function () { return source(registerCleanup); };
-          // cleanup before running getter again
-          var runBefore_1 = function () {
-              if (cleanup) {
-                  cleanup();
-              }
-          };
-          if (flushMode === 'sync') {
-              return vm.$watch(getter_1, noopFn, {
-                  immediate: true,
-                  deep: options.deep,
-                  // @ts-ignore
-                  sync: true,
-                  before: runBefore_1,
-              });
+          var watcher_1 = createVueWatcher(vm, getter_1, noopFn, {
+              noRun: true,
+              deep: options.deep,
+              sync: isSync,
+              before: runCleanup,
+          });
+          // enable the watcher update
+          watcher_1.lazy = false;
+          var originGet = watcher_1.get.bind(watcher_1);
+          if (isSync) {
+              watcher_1.get();
           }
-          var stopRef_1;
-          var hasEnded_1 = false;
-          var doWatch = function () {
-              if (hasEnded_1)
-                  return;
-              stopRef_1 = vm.$watch(getter_1, noopFn, {
-                  immediate: false,
-                  deep: options.deep,
-                  // @ts-ignore
-                  before: runBefore_1,
-              });
-          };
-          /* without a current active instance, ignore pre|post mode */
-          if (vm === fallbackVM) {
-              vm.$nextTick(doWatch);
-          }
           else {
-              queueFlushJob(vm, doWatch, flushMode);
+              vm.$nextTick(originGet);
           }
+          watcher_1.get = createScheduler(originGet);
           return function () {
-              hasEnded_1 = true;
-              stopRef_1 && stopRef_1();
+              watcher_1.teardown();
+              runCleanup();
           };
@@ -887,28 +912,28 @@ }
           // cleanup before running cb again
-          if (cleanup) {
-              cleanup();
-          }
+          runCleanup();
           cb(n, o, registerCleanup);
       };
-      var callback = flushMode === 'sync' ||
-          /* without a current active instance, ignore pre|post mode */
-          vm === fallbackVM
-          ? applyCb
-          : function (n, o) {
-              return queueFlushJob(vm, function () {
-                  applyCb(n, o);
-              }, flushMode);
+      var callback = createScheduler(applyCb);
+      if (!options.lazy) {
+          var originalCallbck_1 = callback;
+          // `shiftCallback` is used to handle the first sync effect run.
+          // The subsequent callbacks will redirect to `callback`.
+          var shiftCallback_1 = function (n, o) {
+              shiftCallback_1 = originalCallbck_1;
+              applyCb(n, o);
           };
-      // `shiftCallback` is used to handle dirty sync effect.
-      // The subsequent callbacks will redirect to `callback`.
-      var shiftCallback = function (n, o) {
-          shiftCallback = callback;
-          applyCb(n, o);
-      };
-      return vm.$watch(getter, options.lazy ? callback : shiftCallback, {
+          callback = function (n, o) {
+              shiftCallback_1(n, o);
+          };
+      }
+      // @ts-ignore: use undocumented option "sync"
+      var stop = vm.$watch(getter, callback, {
           immediate: !options.lazy,
           deep: options.deep,
-          // @ts-ignore
-          sync: flushMode === 'sync',
+          sync: isSync,
       });
+      return function () {
+          stop();
+          runCleanup();
+      };
   }
@@ -915,0 +940,0 @@ function watch(source, cb, options) {

dist/vue-composition-api.umd.min.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("vue")):"function"==typeof define&&define.amd?define(["exports","vue"],t):t((e=e||self).vueCompositionApi={},e.Vue)}(this,function(e,t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var n=function(e){return Object.prototype.toString.call(e)},r="function"==typeof Symbol&&Symbol.for,o=function(e){return e},i={enumerable:!0,configurable:!0,get:o,set:o};function u(e,t,n){var r=n.get,u=n.set;i.get=r||o,i.set=u||o,Object.defineProperty(e,t,i)}function f(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var a=Object.prototype.hasOwnProperty;function c(e,t){return a.call(e,t)}function s(e){return"[object Object]"===n(e)}function l(e,n){t.util.warn(e,n)}var v=null,p=null;function d(){return v}function y(){return p}function h(e){p=e}function b(e){return y()}function g(e,t){void 0===t&&(t={});var n=e.config.silent;e.config.silent=!0;var r=new e(t);return e.config.silent=n,r}function _(e,t){return function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];return e.$scopedSlots[t]?e.$scopedSlots[t].apply(e,n):l("slots."+t+'() got called outside of the "render()" scope',e)}}function m(e){return r?Symbol.for(e):e}var $=m("vfa.key.preFlushQueue"),w=m("vfa.key.postFlushQueue"),O=m("vfa.key.accessControlIdentifier"),j=m("vfa.key.reactiveIdentifier"),k=m("vfa.key.nonReactiveIdentifier"),E="vfa.key.refKey",S=function(){return function(e){u(this,"value",{get:e.get,set:e.set})}}();function x(e){return Object.seal(new S(e))}function A(e){var t,n=D(((t={})[E]=e,t));return x({get:function(){return n[E]},set:function(e){return n[E]=e}})}function C(e){return e instanceof S}var P={},M={},U={};function z(e){return c(e,k)&&e[k]===U}function B(e){return c(e,j)&&e[j]===M}function R(e){var t;if(!(!s(e)||z(e)||Array.isArray(e)||C(e)||(t=e,v&&t instanceof v))&&(!c(e,O)||e[O]!==P)){Object.isExtensible(e)&&f(e,O,P);for(var n=Object.keys(e),r=0;r<n.length;r++)V(e,n[r])}}function V(e,t,n){if("__ob__"!==t){var r,o,i=Object.getOwnPropertyDescriptor(e,t);if(i){if(!1===i.configurable)return;r=i.get,o=i.set,r&&!o||2!==arguments.length||(n=e[t])}R(n),Object.defineProperty(e,t,{enumerable:!0,configurable:!0,get:function(){var o=r?r.call(e):n;return t!==E&&C(o)?o.value:o},set:function(i){if(!r||o){var u=r?r.call(e):n;t!==E&&C(u)&&!C(i)?u.value=i:o?o.call(e,i):C(i)&&(n=i),R(i)}}})}}function F(e){var t,n=d();n.observable?t=n.observable(e):t=g(n,{data:{$$state:e}})._data.$$state;return t}function D(e){if(!s(e)||B(e)||z(e)||!Object.isExtensible(e))return e;var t=F(e);return f(t,j,M),R(t),t}function I(e,t){v&&v===e||(e.config.optionMergeStrategies.setup=function(e,t){return function(n,o){return function e(t,n){if(!n)return t;for(var o,i,u,f=r?Reflect.ownKeys(n):Object.keys(n),a=0;a<f.length;a++)"__ob__"!==(o=f[a])&&(i=t[o],u=n[o],c(t,o)?i!==u&&s(i)&&!C(i)&&s(u)&&!C(i)&&e(i,u):t[o]=u);return t}("function"==typeof t&&t(n,o)||{},"function"==typeof e&&e(n,o)||{})}},v=e,t(e))}var K=function(){return(K=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};var Q,T={set:function(e,t,n){(e.__secret_vfa_state__=e.__secret_vfa_state__||{})[t]=n},get:function(e,t){return(e.__secret_vfa_state__||{})[t]}};function q(e){var t=T.get(e,"rawBindings")||{};if(t&&Object.keys(t).length){for(var n=e.$refs,r=T.get(e,"refs")||[],o=0;o<r.length;o++){n[f=r[o]]||(t[f].value=null)}var i=Object.keys(n),u=[];for(o=0;o<i.length;o++){var f,a=t[f=i[o]];n[f]&&a&&C(a)&&(a.value=n[f],u.push(f))}T.set(e,"refs",u)}}function G(e,t){var n=e.$options._parentVnode;if(n){for(var r=T.get(e,"slots")||[],o=function(e,t){var n;if(e){if(e._normalized)return e._normalized;for(var r in n={},e)e[r]&&"$"!==r[0]&&(n[r]=!0)}else n={};for(var r in t)r in n||(n[r]=!0);return n}(n.data.scopedSlots,e.$slots),i=0;i<r.length;i++){o[f=r[i]]||delete t[f]}var u=Object.keys(o);for(i=0;i<u.length;i++){var f;t[f=u[i]]||(t[f]=_(e,f))}T.set(e,"slots",u)}}function H(e,t,n){var r=y();h(e);try{return t(e)}catch(e){if(!n)throw e;n(e)}finally{h(r)}}function J(e){e.mixin({beforeCreate:function(){var e=this,t=e.$options,n=t.setup,r=t.render;r&&(t.render=function(){for(var t=this,n=[],o=0;o<arguments.length;o++)n[o]=arguments[o];return H(e,function(){return r.apply(t,n)})});if(!n)return;if("function"!=typeof n)return;var o=t.data;t.data=function(){return function(e,t){void 0===t&&(t={});var n,r=e.$options.setup,o=function(e){var t={slots:{}};return["root","parent","refs","attrs"].forEach(function(n){var r,o,i;Array.isArray(n)?(r=function(e,t){var n="function"==typeof Symbol&&e[Symbol.iterator];if(!n)return e;var r,o,i=n.call(e),u=[];try{for(;(void 0===t||t-- >0)&&!(r=i.next()).done;)u.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return u}(n,2),o=r[0],i=r[1]):o=i=n,i="$"+i,u(t,o,{get:function(){return e[i]},set:function(){l("Cannot assign to '"+o+"' because it is a read-only property",e)}})}),["emit"].forEach(function(n){var r="$"+n;u(t,n,{get:function(){return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];e[r].apply(e,t)}}})}),t}(e);if(G(e,o.slots),H(e,function(){n=r(t,o)}),!n)return;if(a=n,"function"==typeof a){var i=n;return void(e.$options.render=function(){return G(e,o.slots),H(e,function(){return i()})})}var a;if(s(n)){var v=n;T.set(e,"rawBindings",n),Object.keys(n).forEach(function(t){var n,r=v[t];C(r)||(r=B(r)?A(r):A(s(n=r)?(n.__ob__=F({}).__ob__,f(n,k,U),n):n)),function(e,t,n){var r=e.$options.props;t in e||r&&c(r,t)||u(e,t,{get:function(){return n.value},set:function(e){n.value=e}})}(e,t,r)})}}(e,e.$props),"function"==typeof o?o.call(e,e):o||{}}},mounted:function(){q(this)},updated:function(){q(this)}})}var L=function(e){return"on"+(e[0].toUpperCase()+e.slice(1))};function N(e){return function(t){var n=b(L(e));W(d(),n,e,t)}}function W(e,t,n,r){var o=t.$options,i=e.config.optionMergeStrategies[n];o[n]=i(o[n],r)}var X,Y,Z=N("beforeMount"),ee=N("mounted"),te=N("beforeUpdate"),ne=N("updated"),re=N("beforeDestroy"),oe=(X=["destroyed","deactivated"],L("unmounted"),function(e){var t=d(),n=b();X.forEach(function(r){return W(t,n,r,e)})}),ie=N("errorCaptured"),ue=N("activated"),fe=N("deactivated");function ae(){se(this,$)}function ce(){se(this,w)}function se(e,t){for(var n=e[t],r=0;r<n.length;r++)n[r]();n.length=0}function le(e,t,n){var r=function(){e.$nextTick(function(){e[$].length&&se(e,$),e[w].length&&se(e,w)})};switch(n){case"pre":r(),e[$].push(t);break;case"post":r(),e[w].push(t);break;default:!function(e,t){if(!e)throw new Error("[vue-composition-api] "+t)}(!1,'flush must be one of ["post", "pre", "sync"], but got '+n)}}function ve(e,t,n,r){var i,u,f=r.flush,a=function(e){i=function(){try{e()}catch(e){!function(e,t,n){if("undefined"==typeof window||"undefined"==typeof console)throw e;console.error(e)}(e)}}};if(null===n){var c,s=function(){return t(a)},l=function(){i&&i()};if("sync"===f)return e.$watch(s,o,{immediate:!0,deep:r.deep,sync:!0,before:l});var v=!1,p=function(){v||(c=e.$watch(s,o,{immediate:!1,deep:r.deep,before:l}))};return e===Y?e.$nextTick(p):le(e,p,f),function(){v=!0,c&&c()}}u=Array.isArray(t)?function(){return t.map(function(e){return C(e)?e.value:e()})}:C(t)?function(){return t.value}:t;var d=function(e,t){i&&i(),n(e,t,a)},y="sync"===f||e===Y?d:function(t,n){return le(e,function(){d(t,n)},f)},h=function(e,t){h=y,d(e,t)};return e.$watch(u,r.lazy?y:h,{immediate:!r.lazy,deep:r.deep,sync:"sync"===f})}var pe={};var de=function(e){return I(e,J)},ye={install:de};v&&"undefined"!=typeof window&&window.Vue&&de(window.Vue),e.computed=function(e){var t,n;"function"==typeof e?t=e:(t=e.get,n=e.set);var r=g(d(),{computed:{$$state:{get:t,set:n}}});return x({get:function(){return r.$$state},set:function(e){r.$$state=e}})},e.createComponent=function(e){return e},e.createElement=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return p?p.$createElement.apply(p,e):(l("`createElement()` has been called outside of render function."),Q||(Q=g(d()).$createElement),Q.apply(Q,e))},e.default=ye,e.inject=function(e,t){if(!e)return t;var n=function(e,t){for(var n=t;n;){if(n._provided&&c(n._provided,e))return n._provided[e];n=n.$parent}return pe}(e,b());return n!==pe?n:void 0!==t?t:void 0},e.isRef=C,e.onActivated=ue,e.onBeforeMount=Z,e.onBeforeUnmount=re,e.onBeforeUpdate=te,e.onDeactivated=fe,e.onErrorCaptured=ie,e.onMounted=ee,e.onUnmounted=oe,e.onUpdated=ne,e.provide=function(e,t){var n=b();if(!n._provided){var r={};Object.defineProperty(n,"_provided",{get:function(){return r},set:function(e){return Object.assign(r,e)}})}n._provided[e]=t},e.reactive=D,e.ref=A,e.set=function(e,t,n){var r,o=d().util,i=(o.warn,o.defineReactive);if(r=e,Array.isArray(r)&&function(e){var t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}(t))return e.length=Math.max(e.length,t),e.splice(t,1,n),n;if(t in e&&!(t in Object.prototype))return e[t]=n,n;var u=e.__ob__;return e._isVue||u&&u.vmCount?n:u?(i(u.value,t,n),V(e,t,n),u.dep.notify(),n):(e[t]=n,n)},e.toRefs=function(e){if(!s(e))return e;var t={};return Object.keys(e).forEach(function(n){var r=e[n];C(r)||(r=x({get:function(){return e[n]},set:function(t){return e[n]=t}})),t[n]=r}),t},e.watch=function(e,t,n){var r=null;"function"==typeof t?r=t:(n=t,r=null);var o=K({lazy:!1,deep:!1,flush:"post"},n),i=y();return i?function(e){return void 0!==e[$]}(i)||function(e){e[$]=[],e[w]=[],e.$on("hook:beforeUpdate",ae),e.$on("hook:updated",ce)}(i):(Y||(Y=g(d())),i=Y),ve(i,e,r,o)},Object.defineProperty(e,"__esModule",{value:!0})});
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("vue")):"function"==typeof define&&define.amd?define(["exports","vue"],n):n((e=e||self).vueCompositionApi={},e.Vue)}(this,function(e,n){"use strict";n=n&&n.hasOwnProperty("default")?n.default:n;var t=function(e){return Object.prototype.toString.call(e)},r="function"==typeof Symbol&&Symbol.for,o=function(e){return e},i={enumerable:!0,configurable:!0,get:o,set:o};function u(e,n,t){var r=t.get,u=t.set;i.get=r||o,i.set=u||o,Object.defineProperty(e,n,i)}function f(e,n,t,r){Object.defineProperty(e,n,{value:t,enumerable:!!r,writable:!0,configurable:!0})}var a=Object.prototype.hasOwnProperty;function c(e,n){return a.call(e,n)}function s(e){return"[object Object]"===t(e)}function l(e,t){n.util.warn(e,t)}var v=null,p=null;function d(){return v}function y(){return p}function g(e){p=e}function h(e){return y()}function b(e,n){void 0===n&&(n={});var t=e.config.silent;e.config.silent=!0;var r=new e(n);return e.config.silent=t,r}function _(e,n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];return e.$scopedSlots[n]?e.$scopedSlots[n].apply(e,t):l("slots."+n+'() got called outside of the "render()" scope',e)}}function m(e){return r?Symbol.for(e):e}var $=m("vfa.key.preFlushQueue"),w=m("vfa.key.postFlushQueue"),O=m("vfa.key.accessControlIdentifier"),j=m("vfa.key.reactiveIdentifier"),k=m("vfa.key.nonReactiveIdentifier"),E="vfa.key.refKey",S=function(){return function(e){u(this,"value",{get:e.get,set:e.set})}}();function x(e){return Object.seal(new S(e))}function A(e){var n,t=I(((n={})[E]=e,n));return x({get:function(){return t[E]},set:function(e){return t[E]=e}})}function C(e){return e instanceof S}var P={},M={},z={};function R(e){return c(e,k)&&e[k]===z}function U(e){return c(e,j)&&e[j]===M}function B(e){var n;if(!(!s(e)||R(e)||Array.isArray(e)||C(e)||(n=e,v&&n instanceof v))&&(!c(e,O)||e[O]!==P)){Object.isExtensible(e)&&f(e,O,P);for(var t=Object.keys(e),r=0;r<t.length;r++)V(e,t[r])}}function V(e,n,t){if("__ob__"!==n){var r,o,i=Object.getOwnPropertyDescriptor(e,n);if(i){if(!1===i.configurable)return;r=i.get,o=i.set,r&&!o||2!==arguments.length||(t=e[n])}B(t),Object.defineProperty(e,n,{enumerable:!0,configurable:!0,get:function(){var o=r?r.call(e):t;return n!==E&&C(o)?o.value:o},set:function(i){if(!r||o){var u=r?r.call(e):t;n!==E&&C(u)&&!C(i)?u.value=i:o?o.call(e,i):C(i)&&(t=i),B(i)}}})}}function F(e){var n,t=d();t.observable?n=t.observable(e):n=b(t,{data:{$$state:e}})._data.$$state;return n}function I(e){if(!s(e)||U(e)||R(e)||!Object.isExtensible(e))return e;var n=F(e);return f(n,j,M),B(n),n}function D(e,n){v&&v===e||(e.config.optionMergeStrategies.setup=function(e,n){return function(t,o){return function e(n,t){if(!t)return n;for(var o,i,u,f=r?Reflect.ownKeys(t):Object.keys(t),a=0;a<f.length;a++)"__ob__"!==(o=f[a])&&(i=n[o],u=t[o],c(n,o)?i!==u&&s(i)&&!C(i)&&s(u)&&!C(i)&&e(i,u):n[o]=u);return n}("function"==typeof n&&n(t,o)||{},"function"==typeof e&&e(t,o)||{})}},v=e,n(e))}var K=function(){return(K=Object.assign||function(e){for(var n,t=1,r=arguments.length;t<r;t++)for(var o in n=arguments[t])Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o]);return e}).apply(this,arguments)};function Q(e,n){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var r,o,i=t.call(e),u=[];try{for(;(void 0===n||n-- >0)&&!(r=i.next()).done;)u.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(t=i.return)&&t.call(i)}finally{if(o)throw o.error}}return u}var T,q={set:function(e,n,t){(e.__secret_vfa_state__=e.__secret_vfa_state__||{})[n]=t},get:function(e,n){return(e.__secret_vfa_state__||{})[n]}};function G(e){var n=q.get(e,"rawBindings")||{};if(n&&Object.keys(n).length){for(var t=e.$refs,r=q.get(e,"refs")||[],o=0;o<r.length;o++){var i=n[a=r[o]];!t[a]&&i&&C(i)&&(i.value=null)}var u=Object.keys(t),f=[];for(o=0;o<u.length;o++){var a;i=n[a=u[o]];t[a]&&i&&C(i)&&(i.value=t[a],f.push(a))}q.set(e,"refs",f)}}function H(e,n){var t=e.$options._parentVnode;if(t){for(var r=q.get(e,"slots")||[],o=function(e,n){var t;if(e){if(e._normalized)return e._normalized;for(var r in t={},e)e[r]&&"$"!==r[0]&&(t[r]=!0)}else t={};for(var r in n)r in t||(t[r]=!0);return t}(t.data.scopedSlots,e.$slots),i=0;i<r.length;i++){o[f=r[i]]||delete n[f]}var u=Object.keys(o);for(i=0;i<u.length;i++){var f;n[f=u[i]]||(n[f]=_(e,f))}q.set(e,"slots",u)}}function J(e,n,t){var r=y();g(e);try{return n(e)}catch(e){if(!t)throw e;t(e)}finally{g(r)}}function L(e){e.mixin({beforeCreate:function(){var e=this,n=e.$options,t=n.setup,r=n.render;r&&(n.render=function(){for(var n=this,t=[],o=0;o<arguments.length;o++)t[o]=arguments[o];return J(e,function(){return r.apply(n,t)})});if(!t)return;if("function"!=typeof t)return;var o=n.data;n.data=function(){return function(e,n){void 0===n&&(n={});var t,r=e.$options.setup,o=function(e){var n={slots:{}};return["root","parent","refs","attrs"].forEach(function(t){var r,o,i;Array.isArray(t)?(r=Q(t,2),o=r[0],i=r[1]):o=i=t,i="$"+i,u(n,o,{get:function(){return e[i]},set:function(){l("Cannot assign to '"+o+"' because it is a read-only property",e)}})}),["emit"].forEach(function(t){var r="$"+t;u(n,t,{get:function(){return function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];e[r].apply(e,n)}}})}),n}(e);if(H(e,o.slots),J(e,function(){t=r(n,o)}),!t)return;if(a=t,"function"==typeof a){var i=t;return void(e.$options.render=function(){return H(e,o.slots),J(e,function(){return i()})})}var a;if(s(t)){var v=t;q.set(e,"rawBindings",t),Object.keys(t).forEach(function(n){var t,r=v[n];C(r)||(r=U(r)?A(r):A(s(t=r)?(t.__ob__=F({}).__ob__,f(t,k,z),t):t)),function(e,n,t){var r=e.$options.props;n in e||r&&c(r,n)||u(e,n,{get:function(){return t.value},set:function(e){t.value=e}})}(e,n,r)})}}(e,e.$props),"function"==typeof o?o.call(e,e):o||{}}},mounted:function(){G(this)},updated:function(){G(this)}})}var N=function(e){return"on"+(e[0].toUpperCase()+e.slice(1))};function W(e){return function(n){var t=h(N(e));X(d(),t,e,n)}}function X(e,n,t,r){var o=n.$options,i=e.config.optionMergeStrategies[t];o[t]=i(o[t],r)}var Y,Z,ee=W("beforeMount"),ne=W("mounted"),te=W("beforeUpdate"),re=W("updated"),oe=W("beforeDestroy"),ie=(Y=["destroyed","deactivated"],N("unmounted"),function(e){var n=d(),t=h();Y.forEach(function(r){return X(n,t,r,e)})}),ue=W("errorCaptured"),fe=W("activated"),ae=W("deactivated");function ce(){le(this,$)}function se(){le(this,w)}function le(e,n){for(var t=e[n],r=0;r<t.length;r++)t[r]();t.length=0}function ve(e,n,t){var r=function(){e.$nextTick(function(){e[$].length&&le(e,$),e[w].length&&le(e,w)})};switch(t){case"pre":r(),e[$].push(n);break;case"post":r(),e[w].push(n);break;default:!function(e,n){if(!e)throw new Error("[vue-composition-api] "+n)}(!1,'flush must be one of ["post", "pre", "sync"], but got '+t)}}function pe(e,n,t,r){var i,u,f=r.flush,a="sync"===f,c=function(e){i=function(){try{e()}catch(e){!function(e,n,t){if("undefined"==typeof window||"undefined"==typeof console)throw e;console.error(e)}(e)}}},s=function(){i&&(i(),i=null)},l=function(n){return a||e===Z?n:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];return ve(e,function(){n.apply(void 0,function(){for(var e=[],n=0;n<arguments.length;n++)e=e.concat(Q(arguments[n]));return e}(t))},f)}};if(null===t){var v=function(e,n,t,r){var o=e._watchers.length;return e.$watch(n,t,{immediate:r.immediateInvokeCallback,deep:r.deep,lazy:r.noRun,sync:r.sync,before:r.before}),e._watchers[o]}(e,function(){return n(c)},o,{noRun:!0,deep:r.deep,sync:a,before:s});v.lazy=!1;var p=v.get.bind(v);return a?v.get():e.$nextTick(p),v.get=l(p),function(){v.teardown(),s()}}u=Array.isArray(n)?function(){return n.map(function(e){return C(e)?e.value:e()})}:C(n)?function(){return n.value}:n;var d=function(e,n){s(),t(e,n,c)},y=l(d);if(!r.lazy){var g=y,h=function(e,n){h=g,d(e,n)};y=function(e,n){h(e,n)}}var b=e.$watch(u,y,{immediate:!r.lazy,deep:r.deep,sync:a});return function(){b(),s()}}var de={};var ye=function(e){return D(e,L)},ge={install:ye};v&&"undefined"!=typeof window&&window.Vue&&ye(window.Vue),e.computed=function(e){var n,t;"function"==typeof e?n=e:(n=e.get,t=e.set);var r=b(d(),{computed:{$$state:{get:n,set:t}}});return x({get:function(){return r.$$state},set:function(e){r.$$state=e}})},e.createComponent=function(e){return e},e.createElement=function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return p?p.$createElement.apply(p,e):(l("`createElement()` has been called outside of render function."),T||(T=b(d()).$createElement),T.apply(T,e))},e.default=ge,e.inject=function(e,n){if(!e)return n;var t=function(e,n){for(var t=n;t;){if(t._provided&&c(t._provided,e))return t._provided[e];t=t.$parent}return de}(e,h());return t!==de?t:void 0!==n?n:void 0},e.isRef=C,e.onActivated=fe,e.onBeforeMount=ee,e.onBeforeUnmount=oe,e.onBeforeUpdate=te,e.onDeactivated=ae,e.onErrorCaptured=ue,e.onMounted=ne,e.onUnmounted=ie,e.onUpdated=re,e.provide=function(e,n){var t=h();if(!t._provided){var r={};Object.defineProperty(t,"_provided",{get:function(){return r},set:function(e){return Object.assign(r,e)}})}t._provided[e]=n},e.reactive=I,e.ref=A,e.set=function(e,n,t){var r,o=d().util,i=(o.warn,o.defineReactive);if(r=e,Array.isArray(r)&&function(e){var n=parseFloat(String(e));return n>=0&&Math.floor(n)===n&&isFinite(e)}(n))return e.length=Math.max(e.length,n),e.splice(n,1,t),t;if(n in e&&!(n in Object.prototype))return e[n]=t,t;var u=e.__ob__;return e._isVue||u&&u.vmCount?t:u?(i(u.value,n,t),V(e,n,t),u.dep.notify(),t):(e[n]=t,t)},e.toRefs=function(e){if(!s(e))return e;var n={};return Object.keys(e).forEach(function(t){var r=e[t];C(r)||(r=x({get:function(){return e[t]},set:function(n){return e[t]=n}})),n[t]=r}),n},e.watch=function(e,n,t){var r=null;"function"==typeof n?r=n:(t=n,r=null);var o=K({lazy:!1,deep:!1,flush:"post"},t),i=y();return i?function(e){return void 0!==e[$]}(i)||function(e){e[$]=[],e[w]=[],e.$on("hook:beforeUpdate",ce),e.$on("hook:updated",se)}(i):(Z||(Z=b(d())),i=Z),pe(i,e,r,o)},Object.defineProperty(e,"__esModule",{value:!0})});

package.json

 {
   "name": "@vue/composition-api",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Provide logic composition capabilities for Vue.",
@@ -47,3 +47,3 @@ "keywords": [
     "ts-jest": "^24.0.2",
-    "typescript": "^3.4.5",
+    "typescript": "^3.6.2",
     "vue": "^2.5.22"
@@ -50,0 +50,0 @@ },

README.md

@@ -16,2 +16,3 @@ # Vue Composition API
 - [TypeScript](#TypeScript)
+  - [TSX](#tsx)
 - [Limitations](#Limitations)
@@ -58,4 +59,6 @@ - [API](https://vue-composition-api-rfc.netlify.com/api.html)
 
-**Please upgrade to the latest TypeScript. If you are using vetur, make sure to set `vetur.useWorkspaceDependencies` to `true`.**
+We provide an Example [Repository](https://github.com/liximomo/vue-composition-api-tsx-example) with TS and TSX support to help you start.
 
+**This plugin requires TypeScript version >3.5.1. If you are using vetur, make sure to set `vetur.useWorkspaceDependencies` to `true`.**
+
 To let TypeScript properly infer types inside Vue component options, you need to define components with `createComponent`:
@@ -76,2 +79,27 @@
 
+## TSX
+
+To support TSX, create a declaration file with following content in your project.
+
+```ts
+// file: shim-tsx.d.ts
+import Vue, { VNode } from 'vue';
+import { ComponentRenderProxy } from '@vue/composition-api';
+
+declare global {
+  namespace JSX {
+    // tslint:disable no-empty-interface
+    interface Element extends VNode {}
+    // tslint:disable no-empty-interface
+    interface ElementClass extends ComponentRenderProxy {}
+    interface ElementAttributesProperty {
+      $props: any; // specify the property name to use
+    }
+    interface IntrinsicElements {
+      [elem: string]: any;
+    }
+  }
+}
+```
+
 # Limitations
@@ -156,6 +184,6 @@
 > :white_check_mark:
- Support     :x: Not Supported
+> Support     :x: Not Supported
 
 :white_check_mark:
- String ref && return it from `setup()`:
+String ref && return it from `setup()`:
 
@@ -186,3 +214,3 @@ ```html
 :white_check_mark:
- String ref && return it from `setup()` && Render Function / JSX:
+String ref && return it from `setup()` && Render Function / JSX:
 
@@ -189,0 +217,0 @@ ```jsx

README.zh-CN.md

@@ -16,2 +16,3 @@ # Vue Composition API
 - [TypeScript](#TypeScript)
+  - [TSX](#tsx)
 - [限制](#限制)
@@ -58,2 +59,4 @@ - [API](https://vue-composition-api-rfc.netlify.com/api.html)
 
+我们提供了一个配置好 TC/TSX 支持的[示例仓库](https://github.com/liximomo/vue-composition-api-tsx-example)来帮助你快速开始.
+
 **请使用最新版的 TypeScript，如果你使用了 `vetur`，请将 `vetur.useWorkspaceDependencies` 设为 `true`。**
@@ -76,2 +79,27 @@
 
+## TSX
+
+要支持 TSX，请创建一个类型定义文件并提供正确的 JSX 定义。内容如下：
+
+```ts
+// file: shim-tsx.d.ts`
+import Vue, { VNode } from 'vue';
+import { ComponentRenderProxy } from '@vue/composition-api';
+
+declare global {
+  namespace JSX {
+    // tslint:disable no-empty-interface
+    interface Element extends VNode {}
+    // tslint:disable no-empty-interface
+    interface ElementClass extends ComponentRenderProxy {}
+    interface ElementAttributesProperty {
+      $props: any; // specify the property name to use
+    }
+    interface IntrinsicElements {
+      [elem: string]: any;
+    }
+  }
+}
+```
+
 # 限制
@@ -78,0 +106,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

284747

increased by1.82%

Number of downloads

145602

increased by6.58%

Lines of code

6615

increased by1.22%

Number of lines in readme file

309

increased by9.96%

No dependency changes