asajs 4.1.6 → 4.1.8

package/dist/js/compilers/FormatProperties.js

@@ -9,6 +9,19 @@ export function FormatProperties(properties) {
             property_bag[key] = value;
             delete properties[key];
         }
+        if (key.startsWith("$")) {
+            const [varName, varType] = key.split("|");
+            switch (varType) {
+                case "d":
+                    properties[`${varName}|default`] = value;
+                    delete properties[key];
+                    break;
+                case "default":
+                    break;
+                default:
+                    throw new Error("Invalid variable type");
+            }
+        }
     }
     if (config.compiler?.fixInventoryItemRenderer && property_bag[BagBinding.ITEM_ID_AUX]) {
         property_bag[BagBinding.ITEM_ID_AUX] = `(${property_bag[BagBinding.ITEM_ID_AUX]} / 1)`;

package/dist/js/compilers/bindings/Checker.js

@@ -25,6 +25,9 @@ export function isHasBinding(input) {
 export function isBinding(input) {
     return /^#\w+$/.test(input);
 }
+export function isVariable(input) {
+    return /^\$\w+$/.test(input);
+}
 export function isNumber(input) {
     return /^[+-]?(?:\d+|\d+\.\d*|\.\d+)(?:[eE][+-]?\d+)?$/.test(input);
 }

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

@@ -1,6 +1,6 @@
-import { bs, RandomBindingString, RandomString, ResolveBinding } from "../../components/Utils.js";
+import { bs, RandomBindingString, RandomString, ResolveBinding, vs } from "../../components/Utils.js";
 import { bindingFuntions } from "../Configuration.js";
-import { isBinding, isNumber, isString } from "./Checker.js";
+import { isBinding, isNumber, isString, isVariable } from "./Checker.js";
 export const FunctionMap = new Map();
 export const defaultFunctions = {
     /**
@@ -224,6 +224,14 @@ export const defaultFunctions = {
             value: bs(input_binding),
         };
     },
+    vs: input_variable => {
+        if (!isVariable(input_variable))
+            throw new Error("Invalid input binding");
+        return {
+            doNotAddParentesis: true,
+            value: vs(input_variable),
+        };
+    },
     /**
      * Return a translatable string
      * @param key

package/dist/js/components/Utils.js

@@ -166,6 +166,13 @@ export function RandomBindingString(length = 16, base = 32, force) {
     else
         return `#${StringID}_binding_${rndStrBind++}`;
 }
+let rndVarBind = 1;
+export function RandomVariableBinding(length = 16, base = 32, force) {
+    if (force || allowRandomStringName)
+        return `$${GenRandomString(length, base)}`;
+    else
+        return `$${StringID}_binding_${rndVarBind++}`;
+}
 const rndMap = new Map();
 export function s(input) {
     if (isNotObfuscate)
@@ -193,6 +200,25 @@ export function bs(input) {
         }
     }
 }
+export function vs(input) {
+    let [name, mode] = input.split("|");
+    input = name;
+    if (mode)
+        mode = "|" + mode;
+    else
+        mode = "";
+    if (isNotObfuscate)
+        return `${name}${mode}`;
+    else {
+        if (rndMap.has(input))
+            return `${rndMap.get(input)}${mode}`;
+        else {
+            const ret = RandomVariableBinding();
+            rndMap.set(input, ret);
+            return `${ret}${mode}`;
+        }
+    }
+}
 export function GetItemByAuxID(auxID) {
     const item = ItemAuxID[auxID];
     if (item)

package/dist/types/compilers/bindings/Checker.d.ts

@@ -7,5 +7,6 @@ export declare function isOctalChar(char: string): boolean;
 export declare function isCompileBinding(input: string): boolean;
 export declare function isHasBinding(input: string): boolean;
 export declare function isBinding(input: string): boolean;
+export declare function isVariable(input: string): boolean;
 export declare function isNumber(input: string): boolean;
 export declare function isString(input: string): boolean;

package/dist/types/compilers/bindings/Function.d.ts

@@ -88,6 +88,10 @@ export declare const defaultFunctions: {
         doNotAddParentesis: true;
         value: `#${string}`;
     };
+    vs: (input_variable: string) => {
+        doNotAddParentesis: true;
+        value: `$${string}`;
+    };
     /**
      * Return a translatable string
      * @param key

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

@@ -1,5 +1,5 @@
 import { Type } from "../types/enums/Type.js";
-import { Array3, Binding, BindingItem } from "../types/properties/value.js";
+import { Array3, Binding, BindingItem, Variable } from "../types/properties/value.js";
 import { ModifyUI, UI } from "./UI.js";
 import { Renderer } from "../types/enums/Renderer.js";
 import { Properties, CollectionPanel, Grid, Image, InputPanel, Label, Panel, Screen, StackPanel, TooltipTrigger, Button, Toggle, Dropdown, SelectionWheel, EditBox, ScrollbarBox, ScrollbarTrack, ScrollView, Slider, SliderBox } from "../types/properties/components.js";
@@ -19,8 +19,10 @@ export declare function GenRandomString(length: number, base?: number): string;
 export declare function RandomNamespace(): string;
 export declare function RandomString(length: number, base?: number, force?: boolean): string;
 export declare function RandomBindingString(length?: number, base?: number, force?: boolean): Binding;
+export declare function RandomVariableBinding(length?: number, base?: number, force?: boolean): Variable;
 export declare function s(input: string): string;
-export declare function bs(input: `#${string}`): `#${string}`;
+export declare function bs(input: Binding): Binding;
+export declare function vs(input: Variable): Variable;
 export declare function GetItemByAuxID(auxID: number): string | undefined;
 /**
  * Return format string binding input

package/dist/types/types/properties/value.d.ts

@@ -17,7 +17,7 @@ export type Animation = anim.Animation<AnimType> | AnimationKeyframe<AnimType> |
 export type Array2<T> = [T, T];
 export type Array3<T> = [T, T, T];
 export type Array4<T> = [T, T, T, T];
-export type Value<T> = Variable | T;
+export type Value<T> = Variable | Binding | T;
 export type AnimValue<T> = Value<T | Animation>;
 export type BindingItem = {
     ignored?: Value<boolean>;

package/package.json

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