feat:

Author: lishiwen

example/provide-inject/EnhanceInject.js

@@ -0,0 +1,21 @@
+import { createTextVNode, h, useInject } from "../../lib/m-vue.esm.js";
+
+export default {
+  name: "Consumer",
+  render() {
+    return h("div", {}, [
+      createTextVNode(
+        `自定义增强的inject: ${this.provideContext.count} - ${this.provideContext.notFound}`
+      ),
+    ]);
+  },
+
+  setup() {
+    const provideContext = useInject(["two", "count", "notFound"], {
+      notFound: "this is default value",
+    });
+    return {
+      provideContext,
+    };
+  },
+};

example/provide-inject/ProvideTwo.js

@@ -1,11 +1,16 @@
 import { createTextVNode, h, provide, inject } from "../../lib/m-vue.esm.js";
 import Consumer from "./Consumer.js";
+import EnhanceInject from "./EnhanceInject.js";
 
 export default {
   name: "ProviderTwo",
 
   render() {
-    return h("div", {}, [h("div", {}, "bar: " + this.bar), h(Consumer)]);
+    return h("div", {}, [
+      h("div", {}, "bar: " + this.bar),
+      h(Consumer),
+      h(EnhanceInject),
+    ]);
   },
 
   setup() {

lib/m-vue.cjs.js

@@ -429,13 +429,37 @@ function provide(key, value) {
         provides[key] = value;
     }
 }
-function inject(key) {
+function inject(key, defaultValue) {
     const currentInstance = getCurrentInstance();
     if (currentInstance) {
         const parentProvides = currentInstance.parent.provides;
-        console.log(key, parentProvides);
-        return parentProvides[key];
+        if (key in parentProvides) {
+            return parentProvides[key];
+        }
+        else if (defaultValue) {
+            return defaultValue;
+        }
+    }
+}
+// 扩展的
+function useInject(keys = [], defaultValues = {}) {
+    const currentInstance = getCurrentInstance();
+    if (currentInstance) {
+        const parentProvides = currentInstance.parent.provides;
+        return composeInjectValues(parentProvides, keys, defaultValues);
     }
+    return {};
+}
+function composeInjectValues(provides = {}, keys = [], defaultValues = {}) {
+    return keys.reduce((result, currentKey) => {
+        if (currentKey in provides) {
+            result[currentKey] = provides[currentKey];
+        }
+        else if (defaultValues[currentKey]) {
+            result[currentKey] = defaultValues[currentKey];
+        }
+        return result;
+    }, {});
 }
 
 exports.clearCurrentInstance = clearCurrentInstance;
@@ -452,3 +476,4 @@ exports.render = render;
 exports.renderSlots = renderSlots;
 exports.setCurrentInstance = setCurrentInstance;
 exports.setupComponent = setupComponent;
+exports.useInject = useInject;

lib/m-vue.esm.js

@@ -425,13 +425,37 @@ function provide(key, value) {
         provides[key] = value;
     }
 }
-function inject(key) {
+function inject(key, defaultValue) {
     const currentInstance = getCurrentInstance();
     if (currentInstance) {
         const parentProvides = currentInstance.parent.provides;
-        console.log(key, parentProvides);
-        return parentProvides[key];
+        if (key in parentProvides) {
+            return parentProvides[key];
+        }
+        else if (defaultValue) {
+            return defaultValue;
+        }
+    }
+}
+// 扩展的
+function useInject(keys = [], defaultValues = {}) {
+    const currentInstance = getCurrentInstance();
+    if (currentInstance) {
+        const parentProvides = currentInstance.parent.provides;
+        return composeInjectValues(parentProvides, keys, defaultValues);
     }
+    return {};
+}
+function composeInjectValues(provides = {}, keys = [], defaultValues = {}) {
+    return keys.reduce((result, currentKey) => {
+        if (currentKey in provides) {
+            result[currentKey] = provides[currentKey];
+        }
+        else if (defaultValues[currentKey]) {
+            result[currentKey] = defaultValues[currentKey];
+        }
+        return result;
+    }, {});
 }
 
-export { clearCurrentInstance, createApp, createComponentInstance, createTextVNode, createVNode, getCurrentInstance, h, inject, patch, provide, render, renderSlots, setCurrentInstance, setupComponent };
+export { clearCurrentInstance, createApp, createComponentInstance, createTextVNode, createVNode, getCurrentInstance, h, inject, patch, provide, render, renderSlots, setCurrentInstance, setupComponent, useInject };

src/runtime-core/inject.ts

@@ -19,11 +19,35 @@ export function provide(key, value) {
     }
 }
 
-export function inject(key) {
+export function inject(key, defaultValue) {
     const currentInstance: any = getCurrentInstance();
     if (currentInstance) {
         const parentProvides = currentInstance.parent.provides;
-        console.log(key, parentProvides)
-        return parentProvides[key];
+        if (key in parentProvides) {
+            return parentProvides[key];
+        } else if (defaultValue) {
+            return defaultValue
+        }
+    }
+}
+
+// 扩展的
+export function useInject(keys = [], defaultValues = {}) {
+    const currentInstance: any = getCurrentInstance();
+    if (currentInstance) {
+        const parentProvides = currentInstance.parent.provides;
+        return composeInjectValues(parentProvides, keys, defaultValues);
     }
+    return {}
+}
+
+function composeInjectValues(provides = {}, keys = [], defaultValues = {}) {
+    return keys.reduce((result, currentKey) => {
+        if (currentKey in provides) {
+            result[currentKey] = provides[currentKey];
+        } else if (defaultValues[currentKey]) {
+            result[currentKey] = defaultValues[currentKey]
+        }
+        return result;
+    }, {})
 }