mnemonica 0.9.943 → 0.9.944

package/build/api/types/compileNewModificatorFunctionBody.d.ts

@@ -1,2 +1,2 @@
-declare const compileNewModificatorFunctionBody: (FunctionName: string, asClass?: boolean) => Function;
+declare const compileNewModificatorFunctionBody: (FunctionName: string, asClass?: boolean) => (ConstructHandler: any, CreationHandler: any, SymbolConstructorName: symbol) => any;
 export default compileNewModificatorFunctionBody;

package/build/api/types/compileNewModificatorFunctionBody.js

@@ -1,32 +1,41 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value : true });
+const getClassConstructor = (ConstructHandler, CreationHandler) => {
+	return class extends ConstructHandler {
+		constructor (...args) {
+			const answer = super(...args);
+			return CreationHandler.call(this, answer);
+		}
+	};
+};
+const getFunctionConstructor = (ConstructHandler, CreationHandler) => {
+	return function (...args) {
+		const answer = ConstructHandler.call(this, ...args);
+		return CreationHandler.call(this, answer);
+	};
+};
 const compileNewModificatorFunctionBody = function (FunctionName, asClass = false) {
-	const dt = `${Date.now()}_${`${Math.random()}`.split('.')[1]}`;
-	const modString = asClass ?
-		`class ${FunctionName} extends ConstructHandler_${dt} {
-			constructor(...args) {
-				const answer = super(...args);
-				return CreationHandler_${dt}.call(this, answer);
+	return function (ConstructHandler, CreationHandler, SymbolConstructorName) {
+		return function () {
+			let ModificationBody;
+			if (asClass) {
+				ModificationBody = getClassConstructor(ConstructHandler, CreationHandler);
 			}
-		}`
-		:
-		`const ${FunctionName} = function (...args) {
-			const answer = ConstructHandler_${dt}.call(this, ...args);
-			return CreationHandler_${dt}.call(this, answer);
-		};`;
-	return new Function(`ConstructHandler_${dt}`, `CreationHandler_${dt}`, 'SymbolConstructorName', `return function () {
-
-			${modString}
-
-			Object.defineProperty(${FunctionName}, SymbolConstructorName, {
+			else {
+				ModificationBody = getFunctionConstructor(ConstructHandler, CreationHandler);
+			}
+			ModificationBody.prototype.constructor = ModificationBody;
+			Object.defineProperty(ModificationBody.prototype.constructor, 'name', {
+				value    : FunctionName,
+				writable : false
+			});
+			Object.defineProperty(ModificationBody, SymbolConstructorName, {
 				get () {
-					return '${FunctionName}';
+					return FunctionName;
 				}
 			});
-
-			return ${FunctionName};
-
+			return ModificationBody;
 		};
-	`);
+	};
 };
 exports.default = compileNewModificatorFunctionBody;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mnemonica",
-	"version": "0.9.943",
+	"version": "0.9.944",
 	"description": "abstract technique that aids information retention : instance inheritance system",
 	"type": "commonjs",
 	"main": "./build/index.js",