Make applyClassMixins apply static methods

Author: KyleJune

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install deno
         uses: denolib/setup-deno@master
         with:
-          deno-version: 1.4.0
+          deno-version: 1.4.2
       - name: Check formatting
         if: matrix.config.kind == 'lint'
         run: |

README.md

@@ -1,8 +1,8 @@
 # Mixins
 
-[![version](https://img.shields.io/badge/release-v0.5.0-success)](https://github.com/udibo/mixins/tree/v0.5.0)
-[![deno doc](https://img.shields.io/badge/deno-doc-success?logo=deno)](https://doc.deno.land/https/deno.land/x/mixins@v0.5.0/mod.ts)
-[![deno version](https://img.shields.io/badge/deno-v1.4.0-success?logo=deno)](https://github.com/denoland/deno/tree/v1.4.0)
+[![version](https://img.shields.io/badge/release-v0.6.0-success)](https://github.com/udibo/mixins/tree/v0.6.0)
+[![deno doc](https://img.shields.io/badge/deno-doc-success?logo=deno)](https://doc.deno.land/https/deno.land/x/mixins@v0.6.0/mod.ts)
+[![deno version](https://img.shields.io/badge/deno-v1.4.2-success?logo=deno)](https://github.com/denoland/deno/tree/v1.4.2)
 [![CI](https://github.com/udibo/mixins/workflows/CI/badge.svg)](https://github.com/udibo/mixins/actions?query=workflow%3ACI)
 [![license](https://img.shields.io/github/license/udibo/mixins)](https://github.com/udibo/mixins/blob/master/LICENSE)
 
@@ -24,9 +24,9 @@ but can also be imported directly from GitHub using raw content URLs.
 
 ```ts
 // Import from Deno's third party module registry
-import { applyMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 // Import from GitHub
-import { applyMixins } "https://raw.githubusercontent.com/udibo/mixins/v0.5.0/mod.ts";
+import { applyMixins } "https://raw.githubusercontent.com/udibo/mixins/v0.6.0/mod.ts";
 ```
 
 ### Node.js
@@ -36,14 +36,14 @@ Node.js fully supports ES Modules.
 If a Node.js package has the type "module" specified in its package.json file, the JavaScript bundle can be imported as a `.js` file.
 
 ```js
-import { applyMixins } from "./mixins_v0.5.0.js";
+import { applyMixins } from "./mixins_v0.6.0.js";
 ```
 
 The default type for Node.js packages is "commonjs".
 To import the bundle into a commonjs package, the file extension of the JavaScript bundle must be changed from `.js` to `.mjs`.
 
 ```js
-import { applyMixins } from "./mixins_v0.5.0.mjs";
+import { applyMixins } from "./mixins_v0.6.0.mjs";
 ```
 
 See [Node.js Documentation](https://nodejs.org/api/esm.html) for more information.
@@ -61,15 +61,15 @@ Script tags for ES modules must have the type attribute set to "module".
 
 ```js
 // main.js
-import { applyMixins } from "./mixins_v0.5.0.js";
+import { applyMixins } from "./mixins_v0.6.0.js";
 ```
 
 You can also embed a module script directly into an HTML file by placing the JavaScript code
 within the body of the script tag.
 
 ```html
 <script type="module">
-  import { applyMixins } from "./mixins_v0.5.0.js";
+  import { applyMixins } from "./mixins_v0.6.0.js";
 </script>
 ```
 
@@ -86,7 +86,7 @@ Applies properties of mixins to instance.
 Using `applyMixins` to add properties to an object:
 
 ```ts
-import { applyMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 interface Point {
   x: number;
   y: number;
@@ -108,7 +108,7 @@ point3; // { time: 5, x: 2, y: 3, z: 7 }
 Using `applyMixins` to add properties to a function:
 
 ```ts
-import { applyMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 interface Point {
   x: number;
   y: number;
@@ -145,7 +145,7 @@ point3.toString(); // "2, 3, 7, 5"
 Using `applyMixins` to add properties to a class:
 
 ```ts
-import { applyMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 interface Point {
   x: number;
   y: number;
@@ -197,7 +197,7 @@ point3.toString(); // "1, 2, 3, 4"
 Applies properties of base class prototypes to instance.
 
 ```ts
-import { applyMixins, applyInstanceMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins, applyInstanceMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 class Point {
   constructor(public x: number, public y: number) {}
 
@@ -244,7 +244,7 @@ point.toString(); // "2, 3, 7, 5"
 Applies properties of base class prototypes to class prototype.
 
 ```ts
-import { applyMixins, applyClassMixins } from "https://deno.land/x/mixins@v0.5.0/mod.ts";
+import { applyMixins, applyClassMixins } from "https://deno.land/x/mixins@v0.6.0/mod.ts";
 class Point {
   constructor(public x: number, public y: number) {}
 

apply.ts

@@ -5,6 +5,7 @@
 export function applyMixins<T>(instance: T, mixins: any[]) {
   mixins.forEach((mixin) => {
     Object.getOwnPropertyNames(mixin).forEach((name) => {
+      if (name === "prototype") return;
       Object.defineProperty(
         instance,
         name,
@@ -22,16 +23,17 @@ export function applyMixins<T>(instance: T, mixins: any[]) {
 export function applyInstanceMixins<T>(instance: T, baseCtors: any[]) {
   applyMixins(
     instance,
-    baseCtors.map((baseCtor) => baseCtor.prototype ?? baseCtor),
+    baseCtors.map((baseCtor) => baseCtor.prototype),
   );
 }
 
-/** Applies properties of base class prototypes to class prototype. */
+/** Applies properties of base classes to class. */
 export function applyClassMixins<T>(
   // deno-lint-ignore no-explicit-any
   ctor: { new (...args: any[]): T },
   // deno-lint-ignore no-explicit-any
   baseCtors: any[],
 ) {
+  applyMixins(ctor, baseCtors);
   applyInstanceMixins(ctor.prototype, baseCtors);
 }

apply_test.ts

@@ -202,6 +202,10 @@ Deno.test("applyClassMixins", () => {
   class Point {
     constructor(public x: number, public y: number) {}
 
+    static defaultPosition(): [number, number] {
+      return [0, 0];
+    }
+
     getPosition(): string {
       return [this.x, this.y].join(", ");
     }
@@ -251,7 +255,17 @@ Deno.test("applyClassMixins", () => {
   assertEquals(Point4D.example(), "2, 3, 7, 5");
   assertEquals(
     Object.getOwnPropertyNames(Point4D).sort(),
-    ["example", "length", "name", "prototype", "time", "x", "y", "z"],
+    [
+      "defaultPosition",
+      "example",
+      "length",
+      "name",
+      "prototype",
+      "time",
+      "x",
+      "y",
+      "z",
+    ],
   );
   assertEquals(
     Object.getOwnPropertyNames(Point4D.prototype).sort(),

deps/std/testing/asserts.ts

@@ -1 +1 @@
-export { assertEquals } from "https://deno.land/std@0.69.0/testing/asserts.ts";
+export { assertEquals } from "https://deno.land/std@0.71.0/testing/asserts.ts";