asajs 4.1.10 → 4.1.12

package/dist/js/compilers/Configuration.js

@@ -50,6 +50,7 @@ if (!fs.existsSync("asajs.config.js")) {
 }
 export const config = createRequire(import.meta.url)(path.resolve(process.cwd(), "asajs.config.js")).config;
 export const debugMode = options["debug"] ?? false;
+console.log(debugMode);
 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);
@@ -57,8 +58,8 @@ export const buildFolder = config.compiler?.buildFolder || "build";
 export const uiBuildFolder = config.compiler?.uiBuildFolder || "asajs";
 export const isNotObfuscate = debugMode || !(config.compiler?.obfuscateStringName ?? false);
 export const allowRandomStringName = !(debugMode || !(config.compiler?.allowRandomStringName ?? true));
-export const namespaceCount = debugMode ? 5 : (config.compiler?.namespaceCount ?? 15);
-export const forceRandomStringLength = debugMode ? 5 : config.compiler?.forceRandomStringLength;
+export const namespaceCount = config.compiler?.namespaceCount ?? 15;
+export const forceRandomStringLength = config.compiler?.forceRandomStringLength;
 export const bindingFuntions = config.binding_functions;
 if (!fs.existsSync(".gitignore")) {
     fs.writeFileSync(".gitignore", "node_modules\ncustom", "utf-8");

package/dist/js/components/AnimationKeyframe.js

@@ -1,8 +1,15 @@
+import { config, isNotObfuscate, uiBuildFolder } from "../compilers/Configuration.js";
 import { FormatAnimationProperties } from "../compilers/FormatProperties.js";
 import { Memory } from "../compilers/Memory.js";
 import { Class } from "./Class.js";
-import { RandomNamespace, RandomString } from "./Utils.js";
+import { defaultNamespace, RandomNamespace, RandomString } from "./Utils.js";
+import nodepath from "path";
 import util from "node:util";
+const fileExt = config.compiler?.fileExtension
+    ? config.compiler.fileExtension.startsWith(".")
+        ? config.compiler.fileExtension
+        : `.${config.compiler.fileExtension}`
+    : ".json";
 export class AnimationKeyframe extends Class {
     type;
     properties;
@@ -10,7 +17,7 @@ export class AnimationKeyframe extends Class {
     name;
     namespace;
     extend;
-    constructor(type, properties, name, namespace, path) {
+    constructor(type, properties, name, namespace, path, allowObfuscate) {
         super();
         this.type = type;
         this.properties = properties;
@@ -18,13 +25,18 @@ export class AnimationKeyframe extends Class {
             console.error("The 'namespace' cannot be used as a name");
             process.exit(1);
         }
-        if (namespace && !/^\w+$/.test(namespace)) {
-            console.error(`The '${namespace}' cannot be used as a namespace`);
-            process.exit(1);
+        if (isNotObfuscate || !(allowObfuscate ?? true)) {
+            this.name = name?.match(/^(\w|\/)+/)?.[0] || RandomString(16);
+            this.namespace = namespace || defaultNamespace || RandomNamespace();
+        }
+        else {
+            this.name = RandomString(16);
+            this.namespace = RandomNamespace();
         }
-        this.name = name || RandomString(16);
-        this.namespace = namespace || RandomNamespace();
-        this.path = path || `asajs/${this.namespace}.json`;
+        if (!path)
+            this.path = nodepath.join(uiBuildFolder, `${this.namespace}${fileExt}`);
+        else
+            this.path = path;
         Memory.add(this);
     }
     setNext(keyframe) {

package/dist/js/components/Utils.js

@@ -167,7 +167,7 @@ export function RandomBindingString(length = 16, base = 32, force) {
         return `#${StringID}_binding_${rndStrBind++}`;
 }
 let rndVarBind = 1;
-export function RandomVariableBinding(length = 16, base = 32, force) {
+export function RandomVariableString(length = 16, base = 32, force) {
     if (force || allowRandomStringName)
         return `$${GenRandomString(length, base)}`;
     else
@@ -213,7 +213,7 @@ export function vs(input) {
         if (rndMap.has(input))
             return `${rndMap.get(input)}${mode}`;
         else {
-            const ret = RandomVariableBinding();
+            const ret = RandomVariableString();
             rndMap.set(input, ret);
             return `${ret}${mode}`;
         }

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

@@ -10,7 +10,7 @@ export declare class AnimationKeyframe<T extends AnimType> extends Class {
     readonly name: string;
     readonly namespace: string;
     readonly extend?: AnimationKeyframe<T> | Animation<T>;
-    constructor(type: T, properties: KeyframeAnimationProperties<T>, name?: string, namespace?: string, path?: string);
+    constructor(type: T, properties: KeyframeAnimationProperties<T>, name?: string, namespace?: string, path?: string, allowObfuscate?: boolean);
     setNext(keyframe: AnimationKeyframe<AnimType>): this;
     clearNext(): this;
     protected toJsonUI(): KeyframeAnimationProperties<AnimType>;

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

@@ -19,7 +19,7 @@ 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 RandomVariableString(length?: number, base?: number, force?: boolean): Variable;
 export declare function s(input: string): string;
 export declare function bs(input: Binding): Binding;
 export declare function vs(input: Variable): Variable;

package/package.json

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