Merge pull request #30 from wentout/proto

decorators explanation
wentout · Oct 17, 2023 · 9444d03 · 9444d03
2 parents 637399b + 7f90acc
commit 9444d03
Show file tree

Hide file tree

Showing 12 changed files with 1,306 additions and 4,986 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,26 +1,23 @@
 module.exports = {
+	parser: '@typescript-eslint/parser',
 	env: {
 		node: true,
 		es6: true,
 	},
-	extends: ['eslint:recommended'],
+	extends: [
+		'eslint:recommended',
+		'plugin:@typescript-eslint/eslint-recommended'
+	],
 	parserOptions: {
 		ecmaVersion: 2018,
+		sourceType: 'module'
 	},
 	rules: {
-		'indent': ['error', 'tab'],
-		'key-spacing': [
-			'warn',
-			{
-				beforeColon: true,
-				afterColon: true,
-				align: 'colon',
-			},
-		],
+		indent: ['error', 'tab'],
 		'linebreak-style': ['error', 'unix'],
 		quotes: ['error', 'single'],
 		semi: ['error', 'always'],
-		'no-unused-vars': 'warn',
+		// 'no-unused-vars': 'warn',
 		'no-shadow': [
 			'error',
 			{
@@ -29,13 +26,13 @@ module.exports = {
 				allow: [],
 			},
 		],
-		'space-before-function-paren': [
-			'warn', {
-				'anonymous': 'always',
-				'named': 'always',
-				'asyncArrow': 'always'
-			}
-		],
+		// 'space-before-function-paren': [
+		// 	'warn', {
+		// 		'anonymous': 'always',
+		// 		'named': 'always',
+		// 		'asyncArrow': 'always'
+		// 	}
+		// ],
 		'prefer-template': 'warn',
 		'prefer-spread': 'warn',
 		'no-useless-concat': 'warn',
@@ -60,7 +57,6 @@ module.exports = {
 				position: 'above',
 			},
 		],
-		quotes: ['error', 'single'],
 		yoda: 'warn',
 	},
 	'overrides': [

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -34,10 +34,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@master
-    - name: Use Node.js 14.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@master
       with:
-        node-version: 14.x
+        node-version: 16.x
 
     - name: npm install
       run: npm install

diff --git a/lib/fields.d.ts b/lib/fields.d.ts
@@ -4,7 +4,7 @@ interface FieldDefinition {
 }
 export declare class FieldConstructor implements FieldDefinition {
     [SymbolInitialValue]: unknown;
-    get get(): (this: FieldDefinition) => unknown;
+    get get(): () => unknown;
     get set(): () => never;
     constructor(value: unknown);
     static get SymbolInitialValue(): symbol;

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -1,9 +1,8 @@
-declare const BaseConstructor: ObjectConstructor;
-export declare class BaseClass extends BaseConstructor {
+type Proto<P, T> = Pick<P, Exclude<keyof P, keyof T>> & T;
+export declare const BaseConstructorPrototype: <P extends object, S extends Proto<T, P>, T extends {
+    (): P;
+    new (): { [key in keyof S]: S[key]; };
+}>(this: T, InstanceTarget?: P) => T;
+export declare class BaseClass extends BaseConstructorPrototype {
 }
-export type IDEF<T, P = {}, R = {}> = {
-    new (...args: unknown[]): T;
-    (this: T, ...args: unknown[]): R;
-    prototype: P;
-};
-export {};
+export { FieldConstructor } from './fields';
diff --git a/lib/index.js b/lib/index.js
@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseClass = void 0;
+exports.FieldConstructor = exports.BaseClass = exports.BaseConstructorPrototype = void 0;
 const errors_1 = require("./errors");
 const types_1 = require("./types");
 const fields_1 = require("./fields");
@@ -59,7 +59,8 @@ const handlers = {
         }
         if (prop === 'toJSON') {
             return function () {
-                return JSON.stringify(Object.entries(this).reduce((obj, [key, value]) => {
+                const entries = Object.entries(this);
+                return JSON.stringify(entries.reduce((obj, [key, value]) => {
                     obj[key] = value.valueOf();
                     return obj;
                 }, {}));
@@ -76,11 +77,11 @@ const handlers = {
     },
 };
 const BaseTarget = Object.create(null);
-const BaseConstructor = function (InstanceTarget = BaseTarget) {
+const BaseConstructorPrototype = function (InstanceTarget = BaseTarget) {
     if (!new.target) {
-        const self = BaseConstructor.bind(this, InstanceTarget);
+        const self = exports.BaseConstructorPrototype.bind(this, InstanceTarget);
         self.prototype = {
-            constructor: BaseConstructor
+            constructor: exports.BaseConstructorPrototype
         };
         return self;
     }
@@ -90,19 +91,22 @@ const BaseConstructor = function (InstanceTarget = BaseTarget) {
     do {
         protoPointer = Reflect.getPrototypeOf(protoPointer);
         protoConstrcutor = Reflect.getOwnPropertyDescriptor(protoPointer, 'constructor').value;
-    } while (protoConstrcutor !== BaseConstructor);
+    } while (protoConstrcutor !== exports.BaseConstructorPrototype);
     Reflect.setPrototypeOf(protoPointer, InstancePrototype);
+    return this;
 };
+exports.BaseConstructorPrototype = BaseConstructorPrototype;
 Object.defineProperty(module, 'exports', {
     get() {
-        return BaseConstructor;
+        return exports.BaseConstructorPrototype;
     },
     enumerable: true
 });
-class BaseClass extends BaseConstructor {
+class BaseClass extends exports.BaseConstructorPrototype {
 }
 exports.BaseClass = BaseClass;
-;
+var fields_2 = require("./fields");
+Object.defineProperty(exports, "FieldConstructor", { enumerable: true, get: function () { return fields_2.FieldConstructor; } });
 Object.defineProperty(module.exports, 'BaseClass', {
     get() {
         return BaseClass;