@bikky/compiler 0.0.10 → 0.0.12

package/Libraries/GlobalTypes.d.ts

@@ -7,9 +7,12 @@ type UnionToIntersection<U> =
 type AllConstraints<Super, Constraints> = UnionToIntersection<Constraints> extends never ? Super : Super & UnionToIntersection<Constraints>;
 
 type Class<T> = (new (...args: any[]) => T);
+type ClassStatic<T> = T extends {[name: string]: any} ? Omit<T, "prototype" | "new"> : never;
 type AbstractClass<T> = Function & { prototype: T };
+type AnyClass<T> = Class<T> | AbstractClass<T>;
 type ClassObject<T> = T extends (new (...args: any[]) => infer C) ? C : never;
-type AbstractClassObject<T> = T extends (Function & { prototype: infer C }) ? C : never;
+type AbstractClassObject<T> = T extends AbstractClass<infer C> ? C : never;
+// type AbstractClassObject<T> = T extends (Function & { prototype: infer C }) ? C : never;
 type AbstractClassArguments<T> = T extends abstract new (...args: infer A) => any ? A : never;
 type ClassArguments<T> = T extends (new (...args: infer C) => any) ? C : never;
 
@@ -17,6 +20,9 @@ type ConstructArguments<T> = T extends (new (...args: infer C) => any) ? C : nev
 type Prototype<T> = (Function & { prototype: T });
 type ObjectType<T> = T extends (new (...args: any[]) => infer C) ? C : never;
 
+declare const _super: any;
+declare const ERROR_INFO: string[];
+
 //Unfortunately Typescript doesn't currently support the following typing (as in the decorator's typing
 // information will not properly alter typescript's typing information):
 //First set of params are the ones supplied in the decorator, like: @mixin(common, extra1, extra2);
@@ -24,34 +30,40 @@ declare function mixin<
 	Super extends Object,
 	Extras extends Prototype<any>[]
 >(common: Prototype<Super>, ...constraints: Extras): (
-		//Second set of params are the class the decorator is decorating, in this case the mixin.
-		<
-			MixinClass extends Function & { prototype: Object },
-			Mixin extends Prototype<MixinClass>,
-			ConstructorArgs extends ConstructArguments<Mixin>,
+	//Second set of params are the class the decorator is decorating, in this case the mixin.
+	<
+		MixinClass extends Function & { prototype: Object },
+		Mixin extends Prototype<MixinClass>,
+		ConstructorArgs extends ConstructArguments<Mixin>,
+	>
+	(mixin: MixinClass) => MixinClass & {
+		//We return a mix function that takes the class that the mixin
+		// is to be mixed onto. We want to ensure that the new class
+		// fulfills all the requirements listed with the decorator.
+		mix: <
+			Core extends AllConstraints<Super, GetConstraints<Extras>>
 		>
-			(mixin: MixinClass) => MixinClass & {
-				//We return a mix function that takes the class that the mixin
-				// is to be mixed onto. We want to ensure that the new class
-				// fulfills all the requirements listed with the decorator.
-				mix: <
-					Core extends AllConstraints<Super, GetConstraints<Extras>>
-					>
-					(core: Prototype<Core>) =>
-					//Lastly we return a function that requires the mixin's constructor arguments and returns 
-					// an object which is a combination of the mixin and the provided core class.
-					(new (...args: ConstructorArgs) => Core & Mixin);
+		(core: Prototype<Core>) =>
+			//Lastly we return a function that requires the mixin's constructor arguments and returns 
+			// an object which is a combination of the mixin and the provided core class.
+			(new (...args: ConstructorArgs) => Core & Mixin);
 	});
 
 //This is the same code as the .mix property added by the decorator above. Since the decorator doesn't properly update
 // typing information we'll need to continue calling makeMixer manually (for now). This should be removed once typescript's
 // decorators are updated.
 declare function makeMixer<
-	MixinClass extends (new (...args: any[]) => object),
+	MixinClass extends (Class<object> & {[name: string]: any}),
 	Mixin extends ClassObject<MixinClass>,
 	ConstructorArgs extends ConstructArguments<MixinClass>,
-	Super extends Object, Extras extends Prototype<any>[]>
-	(mixin: MixinClass, common: Prototype<Super>, ...constraints: Extras): (
-		<Core extends AllConstraints<Super, GetConstraints<Extras>>>(core: { new(...args: any[]): Core } ) =>
-			(new (...args: ConstructorArgs) => Core & Mixin));
+	Ancestor extends Object,
+	Extras extends Prototype<any>[],
+>
+(mixin: MixinClass, common: Prototype<Ancestor>, ...constraints: Extras): (
+	<ParentObject extends AllConstraints<Ancestor, GetConstraints<Extras>>,
+		ParentStatic extends ({[name: string]: any})>(core: Class<ParentObject> & ParentStatic) =>
+		((new (...args: ConstructorArgs) =>
+			(ParentObject & Mixin)) & ClassStatic<ParentStatic> & ClassStatic<MixinClass>
+			)
+	);
 

package/Source/ASTInterface/Crawler.js

@@ -23,7 +23,7 @@ var Crawler;
     function Crawl(start, callback) {
         let crawlArray = (array) => {
             for (let i = 0; i < array.length; i++) {
-                array[i] = ts.visitEachChild(array[i], crawl, context);
+                array[i] = ts.visitNode(array[i], crawl);
             }
             array = array.flat(1);
             return array;

package/Transformers/MacroTransformer.d.ts

@@ -1,3 +1 @@
-import * as ts from "typescript";
-export default function (program: ts.Program, pluginOptions: {}): (context: ts.TransformationContext) => (sourceFile: ts.SourceFile) => ts.Node;
 //# sourceMappingURL=MacroTransformer.d.ts.map

package/Transformers/MacroTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MacroTransformer.d.ts","sourceRoot":"","sources":["MacroTransformer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAySjC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,aAC7C,GAAG,qBAAqB,kBAEpB,GAAG,UAAU,aAYlC"}
+{"version":3,"file":"MacroTransformer.d.ts","sourceRoot":"","sources":["MacroTransformer.ts"],"names":[],"mappings":""}