$mol_file fix root dir detection

hyoo-ru · Nov 15, 2024 · 47ef4b4 · 47ef4b4
1 parent 8186ecc
commit 47ef4b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/file/base/base.ts b/file/base/base.ts
@@ -30,8 +30,8 @@ namespace $ {
 			const path = this.path()
 			const base = (this.constructor as typeof $mol_file_base).base
 
-			// Если путь выше или равен base - считаем это корнем
-			return base.startsWith(path)
+			// Если путь выше или равен base или если parent такойже как и this - считаем это корнем
+			return base.startsWith(path) || this == this.parent()
 		}
 
 		@ $mol_mem

diff --git a/view/tree2/to/dts/dts.ts b/view/tree2/to/dts/dts.ts
@@ -178,7 +178,7 @@ namespace $ {
 							if (prop_parts.key) {
 								types.push( type_enforce.call(
 									this,
-									method.data(`${method.type}_${klass_name}_${++assert_count}`),
+									method.data(`${method.type}__${klass_name}_${++assert_count}`),
 									parameters.call(this, main, prop, 0),
 									parameters.call(this, second_main, second_key, 0),
 								) )
@@ -187,7 +187,7 @@ namespace $ {
 							if (prop_parts.next) {
 								types.push( type_enforce.call(
 									this,
-									method.data(`${method.type}_${klass_name}_${++assert_count}`),
+									method.data(`${method.type}__${klass_name}_${++assert_count}`),
 									parameters.call(this, main, prop, prop_parts.key ? 1 : 0),
 									parameters.call(this, second_main, second_key, (left_parts.next ? left_parts : right_parts).key ? 1 : 0),
 								) )
@@ -281,7 +281,7 @@ namespace $ {
 									types.push(
 										type_enforce.call(
 											this,
-											input.data(`${ klass.type }_${prop.type.replace(/[\?\*]*/g, '')}_${++assert_count}`),
+											input.data(`${ klass.type }_${prop.type.replace(/[\?\*]*/g, '')}__${++assert_count}`),
 											result,
 											array_type
 										)
@@ -305,7 +305,7 @@ namespace $ {
 									types.push(
 										type_enforce.call(
 											this,
-											first.data(`${input.type}_${klass_name}_${++assert_count}`),
+											first.data(`${input.type}__${klass_name}_${++assert_count}`),
 											[
 												first.data('[ '),
 												...args,