asajs 4.0.7-indev → 4.0.7

package/config.d.ts

@@ -1,4 +1,9 @@
-import { Variable } from "./src/types/properties/value.ts"
+import { BindingItem, Variable } from "./src/types/properties/value.ts"
+
+export interface RetBindingValue {
+	generate_bindings?: Array<{ source_property_name: string; target_property_name: string }>
+	return_value: string
+}
 
 export interface Config {
 	compiler?: {
@@ -27,4 +32,5 @@ export interface Config {
 		}[]
 	}
 	global_variables?: Record<Variable, string>
+	binding_functions?: Record<string, (...args: string[]) => RetBindingValue>
 }

package/dist/js/compilers/Configuration.js

@@ -1,21 +1,48 @@
 import fs from "fs";
 import path from "path";
 import { createRequire } from "module";
+const options = {};
+for (const arg of process.argv) {
+    if (arg.startsWith("--"))
+        options[arg.slice(2)] = true;
+}
+export const isTestMode = !fs.existsSync("node_modules/asajs");
 if (!fs.existsSync("asajs.config.js")) {
-    fs.copyFileSync("node_modules/asajs/resources/asajs.config.js", "asajs.config.js");
+    if (isTestMode) {
+        fs.writeFileSync("asajs.config.js", [
+            `export function RandomBindingString(length, base = 32) {
+	const chars = "0123456789abcdefghijklmnopqrstuvwxyz".slice(0, base)
+	const out = new Array()
+				
+	try {
+		const buffer = new Uint8Array(length)
+		crypto.getRandomValues(buffer)
+		for (let i = 0; i < length; i++) {
+			out[i] = chars[buffer[i] % base]
+		}
+	} catch {
+		for (let i = 0; i < length; i++) {
+			out[i] = chars[Math.floor(Math.random() * base)]
+		}
+	}
+				
+	return \`#$\{out.join("")}\`
+}\n`,
+            fs.readFileSync("resources/asajs.config.js", "utf-8").replace("asajs/", "./"),
+        ].join("\n"));
+    }
+    else {
+        fs.writeFileSync("asajs.config.js", [
+            'import { RandomBindingString } from "asajs"\n',
+            fs.readFileSync("node_modules/asajs/resources/asajs.config.js", "utf-8"),
+        ].join("\n"));
+    }
 }
+export const config = createRequire(import.meta.url)(path.resolve(process.cwd(), "asajs.config.js")).config;
+export const isBuildMode = options["build"] ?? config.compiler?.enabled ?? false;
+export const isLinkMode = options["link"] ?? config.compiler?.autoImport ?? false;
+export const unLinked = options["unlink"] ?? !(config.compiler?.autoImport ?? true);
+export const bindingFuntions = config.binding_functions;
 if (!fs.existsSync(".gitignore")) {
     fs.writeFileSync(".gitignore", `node_modules`, "utf-8");
 }
-export const config = createRequire(import.meta.url)(path.resolve(process.cwd(), "asajs.config.js")).config;
-export let isBuildMode = config.compiler?.enabled ?? false;
-export let isLinkMode = config.compiler?.autoImport ?? false;
-export let unLinked = !(config.compiler?.autoImport ?? true);
-for (const arg of process.argv) {
-    if (arg === "--build")
-        isBuildMode = true;
-    if (arg === "--link")
-        isLinkMode = true;
-    else if (arg === "--unlink")
-        unLinked = true;
-}

package/dist/js/compilers/bindings/Function.js

@@ -1,4 +1,5 @@
-import { RandomBindingString } from "../../components/Utils.js";
+import { RandomBindingString, ResolveBinding } from "../../components/Utils.js";
+import { bindingFuntions } from "../Configuration.js";
 export const FunctionMap = new Map();
 export const defaultFunctions = {
     /**
@@ -168,3 +169,23 @@ export const defaultFunctions = {
     },
 };
 Object.entries(defaultFunctions).forEach(([key, value]) => FunctionMap.set(key, value));
+if (bindingFuntions)
+    Object.entries(bindingFuntions).forEach(([key, value]) => {
+        // @ts-ignore
+        FunctionMap.set(key, (...args) => {
+            const { generate_bindings, return_value } = value(...args);
+            if (generate_bindings) {
+                const resolve = ResolveBinding(new Map(), ...generate_bindings);
+                return {
+                    genBindings: resolve.map(({ source_property_name, target_property_name }) => ({
+                        source: source_property_name,
+                        target: target_property_name,
+                    })),
+                    value: return_value,
+                };
+            }
+            return {
+                value: return_value,
+            };
+        });
+    });

package/dist/js/compilers/ui/builder.js

@@ -1,4 +1,4 @@
-import { config, isBuildMode, isLinkMode, unLinked } from "../Configuration.js";
+import { config, isBuildMode, isLinkMode, isTestMode, unLinked } from "../Configuration.js";
 import { Memory } from "../Memory.js";
 import { createBuildFolder, gamePath, getBuildFolderName, linkToGame, unlink } from "./linker.js";
 import { genManifest, version } from "./manifest.js";
@@ -14,7 +14,7 @@ async function buildUI() {
     });
     if (config.global_variables)
         build.set("ui/_global_variables.json", config.global_variables);
-    const out = await Promise.all(build.entries().map(async ([file, value]) => {
+    const out = await Promise.all(Array.from(build.entries()).map(async ([file, value]) => {
         const outFile = `build/${file}`;
         await fs
             .stat(outFile.split(/\\|\//g).slice(0, -1).join("/"))
@@ -39,7 +39,7 @@ async function buildUI() {
         BuildCache.set("version", version).then(() => Log("INFO", "version set!")),
         fs
             .stat("build/pack_icon.png")
-            .catch(() => fs.copyFile("node_modules/asajs/resources/pack_icon.png", "build/pack_icon.png"))
+            .catch(() => fs.copyFile(isTestMode ? "resources/pack_icon.png" : "node_modules/asajs/resources/pack_icon.png", "build/pack_icon.png"))
             .then(() => Log("INFO", "build/pack_icon.png copied!")),
     ]);
     return out.length;
@@ -64,7 +64,7 @@ if (isBuildMode) {
             console.log("Version:", config.packinfo?.version || [4, 0, 0]);
             console.log("UUID:", await BuildCache.get("uuid"));
             if (gamePath)
-                console.log("Install Path:", `\x1b[32m"${path.join(gamePath, await getBuildFolderName())}"\x1b[0m`);
+                console.log("Install Path:", `\x1b[32m"${path.join(gamePath, "development_resource_packs", await getBuildFolderName())}"\x1b[0m`);
             console.log("=============================================================");
         }
     });

package/dist/js/compilers/ui/linker.js

@@ -32,7 +32,7 @@ export async function createBuildFolder() {
         .then(() => clearBuild());
 }
 export async function getBuildFolderName() {
-    return await BuildCache.getWithSetDefault("build-key", () => RandomString(16));
+    return await BuildCache.getWithSetDefault("build-key", () => `asajs-build-${RandomString(16)}`);
 }
 export let gamePath = null;
 export async function linkToGame() {

package/dist/types/compilers/Configuration.d.ts

@@ -1,5 +1,7 @@
-import { Config } from "../../config.js";
+import { Config, RetBindingValue } from "../../config.js";
+export declare const isTestMode: boolean;
 export declare const config: Config;
-export declare let isBuildMode: boolean;
-export declare let isLinkMode: boolean;
-export declare let unLinked: boolean;
+export declare const isBuildMode: {};
+export declare const isLinkMode: {};
+export declare const unLinked: {};
+export declare const bindingFuntions: Record<string, (...args: string[]) => RetBindingValue> | undefined;

package/dist/types/components/AnimationKeyframe.d.ts

@@ -15,8 +15,8 @@ export declare class AnimationKeyframe<T extends AnimType> extends Class {
     clearNext(): this;
     protected toJsonUI(): KeyframeAnimationProperties<AnimType>;
     protected toJSON(): (Partial<import("../types/properties/element/Animation.js").DurationAnimation> & import("../types/properties/element/Animation.js").KeyframeAnimationPropertiesItem) | (Partial<import("../types/properties/element/Animation.js").AsepriteFlipBookAnimation> & import("../types/properties/element/Animation.js").KeyframeAnimationPropertiesItem) | {
-        from?: import("../types/properties/value.js").Array2<string | number> | undefined;
-        to?: import("../types/properties/value.js").Array2<string | number> | undefined;
+        from?: import("../types/properties/value.js").Value<number> | undefined;
+        to?: import("../types/properties/value.js").Value<number> | undefined;
         duration?: import("../types/properties/value.js").Value<number> | undefined;
         easing?: import("../types/properties/value.js").Value<string | import("../index.js").Easing> | undefined;
         next?: import("../types/properties/value.js").Value<string | AnimationKeyframe<AnimType> | Animation<AnimType>>;
@@ -33,8 +33,8 @@ export declare class AnimationKeyframe<T extends AnimType> extends Class {
         wait_until_rendered_to_play?: import("../types/properties/value.js").Value<boolean>;
         anim_type: T;
     } | {
-        from?: import("../types/properties/value.js").Value<number> | undefined;
-        to?: import("../types/properties/value.js").Value<number> | undefined;
+        from?: import("../types/properties/value.js").Array2<string | number> | undefined;
+        to?: import("../types/properties/value.js").Array2<string | number> | undefined;
         duration?: import("../types/properties/value.js").Value<number> | undefined;
         easing?: import("../types/properties/value.js").Value<string | import("../index.js").Easing> | undefined;
         next?: import("../types/properties/value.js").Value<string | AnimationKeyframe<AnimType> | Animation<AnimType>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asajs",
-	"version": "4.0.7-indev",
+	"version": "4.0.7",
 	"description": "Create your Minecraft JSON-UI resource packs using JavaScript",
 	"keywords": [
 		"Minecraft",

package/resources/asajs.config.js

@@ -1,17 +0,0 @@
-/**
- * Configuration object for the AsaJS build process.
- * @type {import('asajs/config.d.ts').Config}
- */
-export const config = {
-	packinfo: {
-		name: "AsaJS",
-		description: "Create your Minecraft JSON-UI resource packs using JavaScript.",
-		version: [4, 0, 1],
-	},
-	compiler: {
-		enabled: true,
-		autoImport: true,
-		autoEnable: true,
-		importToPreview: false,
-	},
-}