refactor(preset): rework preset
test / test (push) Failing after 5m32s

This commit is contained in:
2026-10-29 20:35:53 +03:00
parent d9e8976e85
commit 2605c1bbc8
41 changed files with 475 additions and 473 deletions
+85 -130
View File
@@ -1,141 +1,96 @@
import os from "os";
import path from "path";
import { BuildSystem, type Config, type ConfigSource } from "./type";
export interface ConfigParams {
name?: string;
main?: string;
preloader?: string;
sources?: string[];
assets?: string[];
libs?: LibDef[] | Record<string, string>;
macros?: string[];
flags?: string[];
meta?: ConfigMeta;
key?: SignKey;
android?: AndroidPreset[];
haxe?: string;
}
export const DEFAULT_CONFIG: Config = {
buildSystem: BuildSystem.HAXE,
platforms: [],
name: "",
main: "",
preloader: null,
sources: [],
assets: [],
libs: [],
macros: [],
flags: [],
icon: null,
meta: {
width: 800,
height: 600,
fps: 60,
},
key: null,
android: [],
haxe: null,
};
export interface ConfigMeta {
title?: string;
filename?: string;
icon?: string;
version?: string;
pack?: string;
author?: string;
company?: string;
width?: number;
height?: number;
mobileWidth?: number;
mobileHeight?: number;
fps?: number;
}
export const absolutePath = (file: string): string => {
const result = path.resolve(process.cwd(), path.normalize(file));
return os.type() === "Windows_NT" ? result.split("\\").join("/") : result;
};
export interface LibDef {
name: string;
version: string;
git?: string;
branch?: string;
}
export const compile = (source: ConfigSource): Config => {
return branch(DEFAULT_CONFIG, source);
};
export interface AndroidPreset {
path: string;
extensions: string[];
}
export const branch = (config: Config, source: ConfigSource): Config => {
const result = structuredClone(config);
export interface SignKey {
store: string;
pass: string;
}
export class Config {
public name: string;
public main: string;
public preloader: string | null;
public sources: string[];
public assets: string[];
public libs: LibDef[];
public macros: string[];
public flags: string[];
public icon: string | null;
public meta: ConfigMeta;
public key: SignKey | null;
public android: AndroidPreset[];
public haxe: string | null;
private _params: ConfigParams[];
constructor(params?: ConfigParams) {
this._params = [];
this.name = "";
this.main = "";
this.preloader = null;
this.sources = [];
this.assets = [];
this.libs = [];
this.macros = [];
this.flags = [];
this.icon = null;
this.meta = {
width: 800,
height: 600,
fps: 60,
};
this.key = null;
this.android = [];
this.haxe = null;
if (params) {
this.update(params);
this.afterUpdate();
}
if (source.buildSystem !== undefined) {
result.buildSystem = source.buildSystem;
}
if (source.platforms !== undefined) {
result.platforms = result.platforms.concat(source.platforms);
}
if (source.name !== undefined) {
result.name = source.name;
}
if (source.main !== undefined) {
result.main = source.main;
}
if (source.preloader !== undefined) {
result.preloader = source.preloader;
}
if (source.sources !== undefined) {
result.sources = result.sources.concat(source.sources.map(absolutePath));
}
if (source.assets !== undefined) {
result.assets = result.assets.concat(source.assets.map(absolutePath));
}
if (source.libs !== undefined) {
result.libs = result.libs.concat(
Array.isArray(source.libs) ? source.libs : Object.entries(source.libs).map(([k, v]) => ({ name: k, version: v })),
);
}
if (source.macros !== undefined) {
result.macros = result.macros.concat(source.macros);
}
if (source.flags !== undefined) {
result.flags = result.flags.concat(source.flags);
}
if (source.meta !== undefined) {
result.meta = { ...result.meta, ...source.meta };
}
if (source.key !== undefined) {
result.key = source.key;
}
if (source.android !== undefined) {
result.android = result.android.concat(
source.android.map((item) => ({ path: absolutePath(item.path), extensions: item.extensions })),
);
}
if (source.haxe !== undefined) {
result.haxe = source.haxe;
}
if (result.meta.icon) {
result.icon = absolutePath(result.meta.icon);
}
static absolutePath(file: string): string {
const result = path.resolve(process.cwd(), path.normalize(file));
return os.type() === "Windows_NT" ? result.split("\\").join("/") : result;
if (!result.meta.mobileWidth) {
result.meta.mobileWidth = result.meta.width;
}
update(params: ConfigParams) {
this._params.push(params);
if (params.name !== undefined) this.name = params.name;
if (params.main !== undefined) this.main = params.main;
if (params.preloader !== undefined) this.preloader = params.preloader;
if (params.sources !== undefined) this.sources = this.sources.concat(params.sources.map(Config.absolutePath));
if (params.assets !== undefined) this.assets = this.assets.concat(params.assets.map(Config.absolutePath));
if (params.libs !== undefined)
this.libs = this.libs.concat(
Array.isArray(params.libs)
? params.libs
: Object.entries(params.libs).map(([k, v]) => ({ name: k, version: v })),
);
if (params.macros !== undefined) this.macros = this.macros.concat(params.macros);
if (params.flags !== undefined) this.flags = this.flags.concat(params.flags);
if (params.meta !== undefined) this.meta = { ...this.meta, ...params.meta };
if (params.key !== undefined) this.key = params.key;
if (params.android !== undefined)
this.android = this.android.concat(
params.android.map((item) => ({ path: Config.absolutePath(item.path), extensions: item.extensions })),
);
if (params.haxe !== undefined) this.haxe = params.haxe;
if (this.meta.icon) this.icon = Config.absolutePath(this.meta.icon);
if (!result.meta.mobileHeight && result.meta.mobileWidth) {
result.meta.mobileHeight = Math.round(result.meta.mobileWidth / 2.222222222);
}
afterUpdate() {
if (this.meta.mobileWidth === null) {
this.meta.mobileWidth = this.meta.width;
}
if (this.meta.mobileHeight === null && this.meta.mobileWidth) {
this.meta.mobileHeight = Math.round(this.meta.mobileWidth / 2.222222222);
}
}
branch(params: ConfigParams) {
const result = new Config();
for (const params of this._params) {
result.update(params);
}
result.update(params);
result.afterUpdate();
return result;
}
}
return result;
};
+79
View File
@@ -13,3 +13,82 @@ export enum Platform {
NEKO = "neko",
CPP = "cpp",
}
export interface LibDef {
name: string;
version: string;
git?: string;
branch?: string;
}
export interface ConfigMeta {
title?: string;
filename?: string;
icon?: string;
version?: string;
pack?: string;
author?: string;
company?: string;
width?: number;
height?: number;
mobileWidth?: number;
mobileHeight?: number;
fps?: number;
}
export interface AndroidPreset {
path: string;
extensions: string[];
}
export interface SignKey {
store: string;
pass: string;
}
export interface ConfigSource {
buildSystem?: BuildSystem;
platforms?: Platform[];
name?: string;
main?: string;
preloader?: string;
sources?: string[];
assets?: string[];
libs?: LibDef[] | Record<string, string>;
macros?: string[];
flags?: string[];
meta?: ConfigMeta;
key?: SignKey;
android?: AndroidPreset[];
haxe?: string;
}
export interface Config {
buildSystem: BuildSystem;
platforms: Platform[];
name: string;
main: string;
preloader: string | null;
sources: string[];
assets: string[];
libs: LibDef[];
macros: string[];
flags: string[];
icon: string | null;
meta: ConfigMeta;
key: SignKey | null;
android: AndroidPreset[];
haxe: string | null;
}
export type PackageJson = Record<string, any>;
export interface ConfigJson {
SdkDir?: string;
BuildDir?: string;
Develop?: boolean;
UseRuffle?: boolean;
Key?: SignKey;
}
export type PresetJson = Record<string, ConfigSource>;