@itrocks/framework 0.3.5 → 0.3.6

package/cjs/reflect-class.d.ts

@@ -1,9 +1,10 @@
 import { PropertyTypes } from '@itrocks/property-type';
 import { ReflectClass as RC } from '@itrocks/reflect';
+import { ReflectProperty } from './reflect-property';
 export declare class ReflectClass<T extends object = object> extends RC<T> {
     inheritPropertyTypes(propertyTypes: PropertyTypes<T>): void;
-    get parent(): any;
-    get properties(): import("@itrocks/reflect").ReflectProperty<T, keyof T>[];
-    get property(): { [K in keyof T]: import("@itrocks/reflect").ReflectProperty<T, K>; };
+    get parent(): ReflectClass | null;
+    get properties(): ReflectProperty<T, keyof T>[];
+    get property(): { [K in keyof T]: ReflectProperty<T, K>; };
     get uses(): import("@itrocks/class-type").Type[];
 }

package/cjs/reflect-class.js

@@ -12,24 +12,23 @@ class ReflectClass extends reflect_1.ReflectClass {
         }
     }
     get parent() {
-        const parent = super.parent
-            ? Object.defineProperties(Object.create(ReflectClass.prototype), Object.getOwnPropertyDescriptors(super.parent))
-            : super.parent;
+        const parentType = Object.getPrototypeOf(this.type);
+        const parent = (parentType === Function.prototype) ? null : new ReflectClass(parentType);
         Object.defineProperty(this, 'parent', { configurable: true, enumerable: false, value: parent, writable: true });
         return parent;
     }
     get properties() {
-        const properties = super.properties;
-        for (const reflectProperty of properties) {
-            Object.defineProperties(Object.create(reflect_property_1.ReflectProperty.prototype), Object.getOwnPropertyDescriptors(reflectProperty));
+        const properties = new Array;
+        for (const name of this.propertyNames) {
+            properties.push(new reflect_property_1.ReflectProperty(this, name));
         }
         Object.defineProperty(this, 'properties', { configurable: true, enumerable: false, value: properties, writable: true });
         return properties;
     }
     get property() {
-        const properties = super.property;
-        for (const entry of Object.entries(properties)) {
-            properties[entry[0]] = Object.defineProperties(Object.create(reflect_property_1.ReflectProperty.prototype), Object.getOwnPropertyDescriptors(entry[1]));
+        const properties = {};
+        for (const property of this.properties) {
+            properties[property.name] = property;
         }
         Object.defineProperty(this, 'property', { configurable: true, enumerable: false, value: properties, writable: true });
         return properties;

package/cjs/reflect-property.d.ts

@@ -1,7 +1,8 @@
 import { HtmlContainer } from '@itrocks/core-transformers';
 import { ReflectProperty as RP } from '@itrocks/reflect';
-export declare class ReflectProperty<T extends object> extends RP<T> {
-    get class(): any;
+import { ReflectClass } from './reflect-class';
+export declare class ReflectProperty<T extends object, K extends keyof T = keyof T> extends RP<T, K> {
+    get class(): ReflectClass<T>;
     edit(format?: string): Promise<any>;
     output(format?: string, askFor?: HtmlContainer): Promise<any>;
     outputMandatoryContainer(format?: string): Promise<any>;

package/cjs/reflect-property.js

@@ -8,7 +8,9 @@ const transformer_2 = require("@itrocks/transformer");
 const reflect_class_1 = require("./reflect-class");
 class ReflectProperty extends reflect_1.ReflectProperty {
     get class() {
-        return Object.setPrototypeOf(super.class, reflect_class_1.ReflectClass.prototype);
+        const value = super.class;
+        Object.defineProperty(this, 'class', { configurable: true, enumerable: false, value, writable: true });
+        return value ? new reflect_class_1.ReflectClass(value.object ?? value.type) : value;
     }
     async edit(format = transformer_2.HTML) {
         const object = this.object ?? this.class.type;

package/package.json

@@ -96,5 +96,5 @@
 		"build:front": "tsc -p src/front/tsconfig.json && sed -i 's#../../##g' *.js *.d.ts"
 	},
 	"types": "./cjs/framework.d.ts",
-	"version": "0.3.5"
+	"version": "0.3.6"
 }