blockbench-types 4.6.0 → 4.6.1

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "blockbench-types",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "Blockbench typescript types",
   "main": "",
-  "types": "types/index.d.ts",
+  "types": "types/blockbench.d.ts",
   "typeScriptVersion": "3.2",
   "repository": {
     "type": "git",
@@ -17,11 +17,18 @@
     "url": "https://github.com/JannisX11/blockbench-types/issues"
   },
   "homepage": "https://github.com/JannisX11/blockbench-types#readme",
+  "scripts": {
+    "generate": "node ./scripts/generate_docs.js"
+  },
   "dependencies": {
     "@types/jquery": "^3.5.4",
     "@types/tinycolor2": "^1.4.3",
     "three": "^0.129.0",
+    "typescript": "^4.9.5",
     "vue": "^2.6.14",
-    "wintersky": "^1.2.0"
+    "wintersky": "^1.2.1"
+  },
+  "devDependencies": {
+    "typedoc": "^0.23.24"
   }
 }

package/scripts/generate_docs.js

@@ -0,0 +1,368 @@
+const TypeDoc = require("typedoc");
+const fs = require('fs');
+const PathModule = require('path');
+
+//const out_path = '../docs/';
+const out_path = '../../blockbench.net/content/api/';
+
+async function main() {
+    const app = new TypeDoc.Application();
+
+    // If you want TypeDoc to load tsconfig.json / typedoc.json files
+    app.options.addReader(new TypeDoc.TSConfigReader());
+    app.options.addReader(new TypeDoc.TypeDocReader());
+
+    app.bootstrap({
+		entryPoints: [
+			"./types/blockbench.d.ts",
+			"./types/textures.d.ts",
+			"./types/action.d.ts",
+			"./types/animation.d.ts",
+			"./types/animation_controller.d.ts",
+			"./types/canvas.d.ts",
+			"./types/codec.d.ts",
+			"./types/format.d.ts",
+			"./types/global.d.ts",
+			"./types/interface.d.ts",
+			"./types/dialog.d.ts",
+			"./types/panel.d.ts",
+			"./types/keyframe.d.ts",
+			"./types/legacy.d.ts",
+			"./types/menu.d.ts",
+			"./types/outliner.d.ts",
+			"./types/group.d.ts",
+			"./types/cube.d.ts",
+			"./types/mesh.d.ts",
+			"./types/plugin.d.ts",
+			"./types/preview.d.ts",
+			"./types/project.d.ts",
+			"./types/mode.d.ts",
+			"./types/settings.d.ts",
+			"./types/timeline.d.ts",
+			"./types/undo.d.ts",
+			"./types/painter.d.ts",
+			"./types/screencam.d.ts",
+			"./types/validator.d.ts",
+			"./types/display_mode.d.ts",
+			"./types/misc.d.ts",
+			"./types/util.d.ts"
+		],
+		sort: ['source-order'],
+		commentStyle: "all"
+		//json: "./json/test.json",
+		//pretty: true
+    });
+
+	let skip_files = ['global', 'legacy'];
+	
+	console.log('Scanning...');
+
+    const project = app.convert();
+
+	if (!project) return; // Failed to parse types
+
+	console.log('Scanned types');
+
+	const external = {
+		'ConditionResolvable': '[ConditionResolvable](https://github.com/JannisX11/blockbench-types/blob/main/types/util.d.ts#L1)',
+
+		'Vue.Component': '[Vue.Component](https://v2.vuejs.org/v2/guide/components.html)',
+
+		'THREE.Vector3': '[THREE.Vector3](https://threejs.org/docs/index.html#api/en/math/Vector3)',
+		'THREE.Euler': '[THREE.Euler](https://threejs.org/docs/index.html#api/en/math/Euler)',
+		'THREE.Quaternion': '[THREE.Quaternion](https://threejs.org/docs/index.html#api/en/math/Quaternion)',
+		'THREE.Object3D': '[THREE.Object3D](https://threejs.org/docs/index.html#api/en/core/Object3D)',
+		'THREE.PerspectiveCamera': '[THREE.PerspectiveCamera](https://threejs.org/docs/index.html#api/en/cameras/PerspectiveCamera)',
+		'THREE.OrthographicCamera': '[THREE.OrthographicCamera](https://threejs.org/docs/index.html#api/en/cameras/OrthographicCamera)',
+		'THREE.WebGLRenderer': '[THREE.WebGLRenderer](https://threejs.org/docs/index.html#api/en/renderers/WebGLRenderer)',
+
+		'HTMLElement': '[HTMLElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement)',
+		'HTMLCanvasElement': '[HTMLCanvasElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement)',
+		'HTMLAudioElement': '[HTMLAudioElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLAudioElement)',
+		'CanvasRenderingContext2D': '[CanvasRenderingContext2D](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D)',
+		'Date': '[Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date)',
+		'Event': '[Event](https://developer.mozilla.org/en-US/docs/Web/API/Event)',
+		'PointerEvent': '[PointerEvent](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent)',
+	}
+	let top_level_references = {};
+	let top_level_hidden_references = {};
+	for (let file of project.children) {
+		let file_name = file.name.replace(/[^\w]/gi, '');
+		for (let concept of file.children) {
+			anchor_name = concept.name.replace(/[^\w]/gi, '').replace(/^_/, '').toLowerCase();
+			if (anchor_name == file_name) anchor_name += '-1';
+
+			if (concept.kindString == 'Interface' || concept.kindString == 'Type alias') {
+				top_level_hidden_references[concept.name] = `[${concept.name}](${concept.sources?.[0]?.url || ''})`;
+			} else {
+				top_level_references[concept.name] = file_name + '#' + anchor_name;
+			}
+		}
+	}
+
+	function getReferenceLink(reference) {
+		if (reference.qualifiedName && (external[reference.qualifiedName] || external[reference.name])) {
+			return (external[reference.qualifiedName] || external[reference.name]);
+		}
+		if (top_level_hidden_references[reference.name]) {
+			return top_level_hidden_references[reference.name];
+		}
+		let link = '#' + reference.name;
+		if (top_level_references[reference.name]) {
+			link = top_level_references[reference.name];
+		}
+		return `[${reference.name}](${link})`
+	}
+	function getType(type) {
+		if (!type) return 'Function'
+
+		switch (type.type) {
+			case 'reflection': return `[See types](${type.declaration?.sources?.[0]?.url || ''})`;
+
+			case 'intrinsic': return '*' + type.name + '*';
+
+			case 'tuple': return 'Array';
+
+			case 'literal': return typeof type.value == 'string' ? ('`"' + type.value + '"`') : ('`' + type.value + '`');
+
+			case 'reference': {
+				if (type.name == 'Partial' && type.typeArguments?.[0]) {
+					return getType(type.typeArguments?.[0])
+				}
+				return getReferenceLink(type)
+			};
+
+			case 'array': return 'Array of ' + getType(type.elementType);
+			
+			case 'union': return type.types.map(t => getType(t)).join(' or ');
+
+			default: return '';
+		}
+	}
+	function addComments(object, lines, default_value) {
+		if (object.comment?.summary) {
+			for (let comment of object.comment.summary) {
+				lines.push(comment.text, '');
+			}
+		} else if (default_value) {
+			lines.push(default_value, '');
+		}
+	}
+	function addArgumentTree(arguments, lines) {
+		if (arguments?.length) lines.push('##### Arguments:');
+		function generateArgumentList(list, depth) {
+			list.forEach((object) => {
+				let line = '';
+				let is_nested = (object.type?.type == 'reference' && object.type.reflection && object.type.reflection.children && object.type.reflection.kindString == 'Interface');
+				for (let i = 0; i < depth; i++) {
+					line += '\t';
+				}
+				line += '* `' + object.name + '`: ' + (is_nested ? object.type?.name : getType(object.type));
+				if (object.flags.isOptional) line += ' (Optional)';
+				if (object.comment?.summary) {
+					line += ' -';
+					for (let comment of object.comment.summary) {
+						line += ' ' + comment.text;
+					}
+				}
+				lines.push(line);
+
+				if (is_nested) {
+					generateArgumentList(object.type.reflection.children, depth + 1);
+				}
+			})
+		}
+		generateArgumentList(arguments, 0);
+		lines.push('');
+	}
+	function generateArgumentSuffix(arguments) {
+		if (arguments && arguments.length) {
+			let args = '';
+			let required_args = arguments.filter(p => !p.flags.isOptional).map(p => p.name).join(', ');
+			let optional_args = arguments.filter(p => p.flags.isOptional).map(p => p.name).join(', ');
+			if (required_args && optional_args) {
+				args = required_args + '[, ' + optional_args + ']';
+			} else if (required_args) {
+				args = required_args
+			} else if (optional_args) {
+				args = '['+optional_args+']';
+			}
+			return `( ${args} )`;
+		} else {
+			return '()';
+		}
+	}
+	function toTitleCase(input) {
+		return input.split(/[ _.-]/).map(word => word[0].toUpperCase() + word.substring(1)).join(' ');
+	}
+
+
+
+	
+	let num_files = 0;
+	for (let file of project.children) {
+		if (skip_files.includes(file.name)) continue;
+
+		let file_name = file.name.replace(/[^\w]/gi, '');
+		let display_name = toTitleCase(file.name);
+		let markdown_lines = [
+			'---', `title: ${display_name}`, '---',
+			'',
+			`# ${display_name}`
+		];
+		let addLine = (s, empty_after) => {
+			markdown_lines.push(s || '');
+			if (empty_after && s) markdown_lines.push('');
+		}
+
+
+		for (let concept of file.children) {
+			if (concept.kindString == 'Interface') continue;
+			if (concept.kindString == 'Type alias') continue;
+
+			if (concept.name.startsWith('_')) concept.name = concept.name.substring(1);
+
+			if (concept.kindString == 'Function') {
+				for (let signature of concept.signatures) {
+					let suffix = generateArgumentSuffix(signature.parameters);
+					addLine(`## ${signature.name.replace(/^_/, '')}${suffix}`);
+					addLine(`#### Global Function`, true);
+
+					addComments(signature, markdown_lines);
+
+					if (signature.parameters) {
+						addArgumentTree(signature.parameters, markdown_lines);
+					}
+
+					if (signature.type && signature.type.name !== 'void') {
+						addLine(`Returns: ${getType(signature.type)}`);
+					}
+				}
+				addLine();
+			} else {
+				addLine(`## ${concept.name}`);
+			}
+			if (concept.kindString != 'Class' && concept.kindString != 'Function') {
+				let kind = concept.kindString;
+				if (kind != 'Interface' && kind != 'Type alias' && kind != 'Namespace') {
+					kind = 'Global ' + kind;
+				}
+				addLine(`#### ${kind}`, true);
+			}
+			if (concept.kindString == 'Variable') {
+				addLine(`Type: ${getType(concept.type)}`, true);
+			}
+
+			// Extend
+			if (concept.extendedTypes) {
+				let parents = concept.extendedTypes.map(type => {
+					return getReferenceLink(type);
+				});
+				addLine('Extends: ' + parents.join(', '), true);
+			}
+			if (concept.extendedBy) {
+				let parents = concept.extendedBy.map(type => {
+					return getReferenceLink(type);
+				});
+				addLine('Extended by: ' + parents.join(', '), true);
+			}
+			// Comment
+			addComments(concept, markdown_lines);
+
+			// Children
+			if (concept.children) {
+				if (concept.children[0]) {}
+
+				let handled = [];
+				// Constructor
+				for (let child of concept.children) {
+					if (child.kindString != 'Constructor') continue;
+					let sig_i = 0;
+					for (let signature of child.signatures) {
+						let suffix = generateArgumentSuffix(signature.parameters);
+						addLine(`### ${signature.name}${suffix}`);
+
+						if (sig_i) {
+							addLine(`*Alternative constructor signature*`, true);
+							continue;
+						}
+						addComments(signature, markdown_lines, `Creates a new ${concept.name}`);
+
+						if (signature.parameters) {
+							addArgumentTree(signature.parameters, markdown_lines);
+						}
+						sig_i++;
+						//break; // Only use first signature in types for simplicity
+					}
+					addLine();
+					handled.push(child.id);
+				}
+
+				// Properties
+				let properties = concept.children.filter(child => (child.kindString == 'Property' || child.kindString == 'Variable') && !child.type?.name?.startsWith('BlockbenchType') && !child.flags.isStatic);
+				if (properties.length) {
+					addLine('| Property | Type | Description |');
+					addLine('| -------- | ---- | ----------- |');
+				}
+				for (let child of properties) {
+					addLine(`| ${child.name} | ${getType(child.type)} | ${child.comment?.summary?.[0]?.text || ''} |`);
+					handled.push(child.id);
+				}
+				if (properties.length) {
+					addLine();
+				}
+
+				// Methods
+				for (let child of concept.children) {
+					if (child.kindString != 'Method' && child.kindString != 'Function') continue;
+					for (let signature of child.signatures) {
+						let prefix = child.flags.isStatic ? (concept.name + '.') : '';
+						let suffix = generateArgumentSuffix(signature.parameters);
+						addLine(`### ${prefix}${signature.name.replace(/^_/, '')}${suffix}`);
+						addComments(signature, markdown_lines);
+
+						if (signature.parameters) {
+							addArgumentTree(signature.parameters, markdown_lines);
+						}
+
+						if (signature.type && signature.type.name !== 'void') {
+							addLine(`Returns: ${getType(signature.type)}`);
+						}
+					}
+					addLine();
+					handled.push(child.id);
+				}
+
+				// Misc
+				for (let child of concept.children) {
+					if (handled.includes(child.id)) continue;
+					addLine(`### ${child.name}`);
+					let kind = child.kindString;
+					if (child.flags.isStatic) {
+						kind = 'Static ' + kind;
+					}
+					addLine(kind, true);
+					if (child.kindString == 'Property') {
+						addLine(`Type: ${getType(child.type)}`, true);
+					}
+					addComments(child, markdown_lines);
+					addLine();
+				}
+			}
+
+
+			addLine();
+		}
+
+
+
+		fs.writeFileSync(PathModule.resolve(__dirname, out_path, `${file_name}.md`), markdown_lines.join('\r\n'), "utf-8");
+		num_files++;
+	}
+
+	console.log(`Generated ${num_files} api doc files`);
+
+
+}
+
+main().catch(console.error);

package/tsconfig.json

@@ -0,0 +1,16 @@
+{
+	"include": [
+		"./types/**/*"
+	],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "ES2020",
+        "outDir": "out",
+		"lib": ["dom", "ES2020"],
+        "sourceMap": true,
+        "rootDir": "."
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}

package/types/action.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Registry of all toolbar items, such as actions, tools, etc.
+ */
 declare const BarItems: {
     [id: string]: BarItem
 }
@@ -12,6 +15,9 @@ declare interface KeybindKeys {
     alt?: boolean | null
     meta?: boolean | null
 }
+/**
+ * A customizable keybind
+ */
 declare class Keybind {
     constructor(keys: KeybindKeys)
 }
@@ -29,22 +35,45 @@ interface BarItemOptions extends KeybindItemOptions {
     name?: string
     description?: string
     icon: string
-    condition?: any
+    condition?: ConditionResolvable
     category?: string
     keybind?: Keybind
 }
+/**
+ * Anything that can go into a toolbar, including actions, tools, toggles, widgets etc.
+ */
 declare class BarItem extends KeybindItem {
     constructor(id: string, options: BarItemOptions);
     conditionMet(): boolean;
-    addLabel(in_bar: any, action: any): void;
+    /**
+     * Adds a label to the HTML element of the bar item
+     * @param in_bar Set to true to generate an in-bar label, as opposed to a regular on-hover label
+     * @param action Provide the action to generate the label. This defaults to self and is only needed in special cases
+     */
+    addLabel(in_bar?: boolean, action?: any): void;
+    /**
+     * Gets a copy of the elements HTML node that is not yet in use.
+     */
     getNode(): HTMLElement;
+    /**
+     * Appends the bar item to a HTML element
+     */
     toElement(destination: HTMLElement): this;
     pushToolbar(bar: any): void;
 }
 
 interface ActionOptions extends BarItemOptions {
+    /**
+     * Function to run when user uses the action successfully
+     */
     click(event: Event): void
+    /**
+     * Icon color. Can be a CSS color string, or an axis letter to use an axis color.
+     */
     color?: string
+    /**
+     * ID of a setting that the action is slinked to
+     */
     linked_setting?: string
     children?: object[]
     /**
@@ -52,6 +81,9 @@ interface ActionOptions extends BarItemOptions {
      */
     label?: boolean
 }
+/**
+ * Actions can be triggered to run something, they can be added to menus, toolbars, assigned a keybinding, or run via Action Control
+ */
 declare class Action extends BarItem {
     constructor(id: string, options: ActionOptions);
     /**
@@ -78,6 +110,9 @@ interface ToggleOptions extends ActionOptions {
      */
     onChange?(value: boolean): void
 }
+/**
+ * A toggle is a type of action that can be on or off. The state is not persistent between restarts by default.
+ */
 declare class Toggle extends Action {
     constructor(id: string, options: ToggleOptions);
     /**
@@ -194,6 +229,9 @@ interface ToolOptions extends ActionOptions {
     paintTool?: boolean
     brush?: BrushOptions
 }
+/**
+ * A tool, such as mvoe tool, vertex snap tool, or paint brush
+ */
 declare class Tool extends Action {
     constructor(id: string, options: ToolOptions);
     select(): this | undefined;
@@ -206,7 +244,7 @@ declare class NumSlider extends Widget {
     constructor(id: string, options: object);
     startInput(event: Event): void;
     setWidth(width: any): this;
-    getInterval(event: Event): any;
+    getInterval(event: Event): number;
     slide(clientX: any, event: Event): void;
     input(): void;
     stopInput(): void;
@@ -214,23 +252,23 @@ declare class NumSlider extends Widget {
     trigger(event: Event): boolean;
     setValue(value: number, trim: any): this;
     change(modify: any): void;
-    get(): any;
+    get(): number;
     update(): void;
 }
 declare class BarSlider extends Widget {
     constructor(id: string, options: object);
     change(event: Event): void;
-    set(value: any): void;
-    get(): any;
+    set(value: number): void;
+    get(): number;
 }
 declare class BarSelect extends Widget {
     constructor(id: string, options: object);
     open(event: Event): void;
     trigger(event: Event): boolean | undefined;
     change(event: Event): this;
-    getNameFor(key: any): any;
-    set(key: any): this;
-    get(): any;
+    getNameFor(key: string): string;
+    set(key: string): this;
+    get(): string;
 }
 declare class BarText extends Widget {
     constructor(id: string, options: object);
@@ -262,7 +300,6 @@ declare namespace BARS {
     const stored: {};
     const editing_bar: undefined | Toolbar;
     const action_definers: (() => void)[];
-    const condition: any;
     function defineActions(definer: any): void;
     function setupActions(): void;
     function setupToolbars(): void;
@@ -270,6 +307,9 @@ declare namespace BARS {
     function updateConditions(): void;
     function updateToolToolbar(): void;
 }
+/**
+ * A dialog-based interface to search and trigger actions and other things
+ */
 declare namespace ActionControl {
     const open: boolean;
     const type: string;
@@ -282,6 +322,9 @@ declare namespace ActionControl {
     function click(action: any, event: Event): void;
     function handleKeys(event: Event): boolean;
 }
+/**
+ * Stores and handles keybinds
+ */
 declare namespace Keybinds {
     const actions: BarItem[];
     const stored: {};

package/types/animation.d.ts

@@ -5,7 +5,7 @@ declare class AnimationItem {
 
 interface AnimationOptions {
     name?: string
-    loop?: string
+    loop?: 'once' | 'hold' | 'loop'
     override?: boolean
     anim_time_update?: string
     blend_weight?: string
@@ -13,10 +13,10 @@ interface AnimationOptions {
     snapping?: number
 }
 
-declare class Animation extends AnimationItem {
+declare class _Animation extends AnimationItem {
     constructor(data: AnimationOptions);
     extend(data: AnimationOptions): this;
-    getUndoCopy(options: any, save: any): {
+    getUndoCopy(options?: {}, save?: any): {
         uuid: any;
         name: any;
         loop: any;
@@ -35,16 +35,16 @@ declare class Animation extends AnimationItem {
     rename(): this;
     togglePlayingState(state: any): any;
     showContextMenu(event: any): this;
-    getBoneAnimator(group: any): any;
+    getBoneAnimator(group: any): BoneAnimator;
     add(undo: any): this;
     remove(undo: any, remove_from_file?: boolean): this;
-    getMaxLength(): any;
+    getMaxLength(): number;
     setLoop(value: any, undo: any): void;
-    calculateSnappingFromKeyframes(): any;
+    calculateSnappingFromKeyframes(): number;
     propertiesDialog(): void;
 
     name: string
-    loop: string
+    loop: 'once' | 'hold' | 'loop'
     override: boolean
     anim_time_update: string
     blend_weight: string
@@ -118,14 +118,14 @@ declare class BoneAnimator extends GeneralAnimator {
     position: Keyframe[]
     scale: Keyframe[]
     getGroup(): Group
-    fillValues: () => void
-    pushKeyframe: () => void
-    doRender: () => boolean
-    displayRotation: () => void
-    displayPosition: () => void
-    displayScale: () => void
-    interpolate: () => void
-    displayFrame: () => void
+    fillValues(): void
+    pushKeyframe(): void
+    doRender(): boolean
+    displayRotation(): void
+    displayPosition(): void
+    displayScale(): void
+    interpolate(): void
+    displayFrame(): void
 }
 declare class NullObjectAnimator extends GeneralAnimator {
     name: string
@@ -134,10 +134,10 @@ declare class NullObjectAnimator extends GeneralAnimator {
     position: Keyframe[]
     scale: Keyframe[]
     getElement(): NullObject
-    doRender: () => void
-    displayPosition: () => void
-    displayIK: () => void
-    displayFrame: () => void
+    doRender(): void
+    displayPosition(): void
+    displayIK(): void
+    displayFrame(): void
 }
 declare class EffectAnimator extends GeneralAnimator {
     name: string
@@ -147,7 +147,7 @@ declare class EffectAnimator extends GeneralAnimator {
     scale: Keyframe[]
     pushKeyframe(keyframe): this
     displayFrame(in_loop): this
-    startPreviousSounds: () => void
+    startPreviousSounds(): void
 }
 
 declare class TimelineMarker {