Merge pull request #154 from wentout/proto

apply, call, bind prototype chain fix
wentout · Nov 9, 2023 · f715f86 · f715f86
2 parents 319b43c + 7121d31
commit f715f86
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/build/index.js b/build/index.js
@@ -19,18 +19,18 @@ exports.lookup = function (TypeNestedPath) {
     return types.lookup(TypeNestedPath);
 };
 const apply = function (entity, Constructor, args) {
-    const result = Constructor.apply(entity, args);
+    const result = new entity[Constructor.TypeName](...args);
     return result;
 };
 exports.apply = apply;
 const call = function (entity, Constructor, ...args) {
-    const result = Constructor.call(entity, ...args);
+    const result = new entity[Constructor.TypeName](...args);
     return result;
 };
 exports.call = call;
 const bind = function (entity, Constructor) {
     return (...args) => {
-        const result = Constructor.call(entity, ...args);
+        const result = new entity[Constructor.TypeName](...args);
         return result;
     };
 };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mnemonica",
-	"version": "0.9.971",
+	"version": "0.9.972",
 	"description": "abstract technique that aids information retention : instance inheritance system",
 	"type": "commonjs",
 	"main": "./build/index.js",

diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,4 @@
+/* eslint-disable new-cap */
 'use strict';
 
 import { TypeLookup, IDEF } from './types';
@@ -94,9 +95,10 @@ export const lookup = function (TypeNestedPath) {
 export const apply = function <E extends object, T extends object, S extends Proto<E, T>> (entity: E, Constructor: IDEF<T>, args?: unknown[]): {
 	[key in keyof S]: S[key]
 } {
+	// const result = Constructor.apply(entity, args);
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore
-	const result = Constructor.apply(entity, args);
+	const result = new entity[ Constructor.TypeName ](...args);
 	return result;
 };
 
@@ -105,17 +107,19 @@ export const call = function <E extends object, T extends object, S extends Prot
 } {
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore
-	const result = Constructor.call(entity, ...args);
+	// const result = Constructor.call(entity, ...args);
+	const result = new entity[ Constructor.TypeName ](...args);
 	return result;
 };
 
 export const bind = function <E extends object, T extends object, S extends Proto<E, T>> (entity: E, Constructor: IDEF<T>): (...args: unknown[]) => {
 	[key in keyof S]: S[key]
 } {
 	return (...args) => {
+		// const result = Constructor.call(entity, ...args);
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore
-		const result = Constructor.call(entity, ...args);
+		const result = new entity[ Constructor.TypeName ](...args);
 		return result;
 	};
 };
@@ -171,3 +175,4 @@ export const errors = descriptors.ErrorsTypes;
 
 export { utils } from './utils';
 export { defineStackCleaner } from './utils';
+/* eslint-enable new-cap */
diff --git a/test/environment.js b/test/environment.js
@@ -46,6 +46,8 @@ const tests = (opts) => {
 		moreOver,
 		anotherDefaultTypesCollection,
 		someADTCInstance,
+		SubOfSomeADTCTypePre,
+		SubOfSomeADTCTypePost,
 		subOfSomeADTCInstanceA,
 		subOfSomeADTCInstanceC,
 		subOfSomeADTCInstanceB,
@@ -347,6 +349,8 @@ const tests = (opts) => {
 
 			it('apply & call works correctly', () => {
 
+				expect(SubOfSomeADTCTypePre.existentInstance).equal(someADTCInstance);
+				expect(SubOfSomeADTCTypePost.existentInstance).equal(someADTCInstance);
 				expect(subOfSomeADTCInstanceA.test).equal(123);
 				expect(subOfSomeADTCInstanceA.sub_test).equal(321);
 				expect(subOfSomeADTCInstanceA.args).deep.to.equal([ 1, 2, 3 ]);

diff --git a/test/index.js b/test/index.js
@@ -234,15 +234,27 @@ const SomeADTCType = adtcDefine('SomeADTCType', function () {
 
 const someADTCInstance = new SomeADTCType();
 
+let SubOfSomeADTCTypePre = null;
+let SubOfSomeADTCTypePost = null;
 const SubOfSomeADTCType = SomeADTCType.define('SubOfSomeADTCType', function (...args) {
 	this.sub_test = 321;
 	this.args = args;
 });
 
+SubOfSomeADTCType.registerHook('preCreation', (opts) => {
+	SubOfSomeADTCTypePre = opts;
+});
+SubOfSomeADTCType.registerHook('postCreation', (opts) => {
+	SubOfSomeADTCTypePost = opts;
+});
+
+// debugger;
 const subOfSomeADTCInstanceA = apply(someADTCInstance, SubOfSomeADTCType, [ 1, 2, 3 ]);
 
+// debugger;
 const subOfSomeADTCInstanceC = call(someADTCInstance, SubOfSomeADTCType, 1, 2, 3);
 
+// debugger;
 const subOfSomeADTCInstanceB = bind(someADTCInstance, SubOfSomeADTCType)(1, 2, 3);
 
 
@@ -594,6 +606,8 @@ describe('Main Test', () => {
 		moreOver,
 		anotherDefaultTypesCollection,
 		someADTCInstance,
+		SubOfSomeADTCTypePre,
+		SubOfSomeADTCTypePost,
 		subOfSomeADTCInstanceA,
 		subOfSomeADTCInstanceC,
 		subOfSomeADTCInstanceB,