feat: add task module
test / test (push) Successful in 1m10s

This commit is contained in:
2026-11-10 15:30:34 +03:00
parent 19d475b182
commit 6fd8988251
33 changed files with 241 additions and 219 deletions
+8
View File
@@ -0,0 +1,8 @@
{
"indentation": {
"character": " "
},
"wrapping": {
"maxLineLength": 120
}
}
+8 -9
View File
@@ -2,13 +2,12 @@ import flash.display.Shape;
import flash.Lib;
class Main {
public static function main() {
trace("Hello world!");
var shape = new Shape();
shape.graphics.beginFill(0x00ff00);
shape.graphics.drawCircle(50, 50, 20);
shape.graphics.endFill();
Lib.current.addChild(shape);
}
public static function main() {
trace("Hello world!");
var shape = new Shape();
shape.graphics.beginFill(0x00ff00);
shape.graphics.drawCircle(50, 50, 20);
shape.graphics.endFill();
Lib.current.addChild(shape);
}
}
+2 -2
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env node
import gulp from "gulp";
import { Preset } from ".";
import { Preset, Task } from ".";
import { name, version } from "../package.json" with { type: "json" };
console.log(`[${name} ${version}]`);
@@ -27,7 +27,7 @@ export const main = async () => {
const preset = Preset.loader();
Preset.validator(preset);
const projects = Preset.compiler(preset);
Preset.register(projects);
Task.register(Task.compiler(projects));
if (process.argv.length > 2) {
await runTask(process.argv[2]);
+10 -2
View File
@@ -24,7 +24,6 @@ export const DEFAULT_CONFIG: Config = {
},
key: null,
android: [],
haxe: null,
};
export const absolutePath = (file: string): string => {
@@ -36,7 +35,7 @@ export const compile = (source: ConfigSource): Config => {
return branch(DEFAULT_CONFIG, source);
};
export const branch = (config: Config, source: ConfigSource): Config => {
export const branch = (config: Config, source: ConfigSource | Config): Config => {
const result = structuredClone(config);
if (source.buildSystem !== undefined) {
@@ -97,3 +96,12 @@ export const branch = (config: Config, source: ConfigSource): Config => {
}
return result;
};
export const hasLib = (config: Config, name: string): boolean => {
for (const lib of config.libs) {
if (lib.name === name) {
return true;
}
}
return false;
};
+3 -2
View File
@@ -60,8 +60,9 @@ export class Sdk {
if (this.prepared) {
return Promise.resolve();
} else {
this.log.i("download: *%s*", this.link);
return download(resolveLink(this.link, this), this.path, { strip });
const url = resolveLink(this.link, { name: this.name, version: this.version });
this.log.i("download: *%s*", url);
return download(url, this.path, { strip });
}
}
}
+1 -1
View File
@@ -78,7 +78,7 @@ export interface Config {
meta: ConfigMeta;
key: SignKey | null;
android: AndroidPreset[];
haxe: string | null;
haxe?: string;
}
export type PackageJson = Record<string, any>;
+9 -7
View File
@@ -100,11 +100,13 @@ export class Haxe extends Sdk {
haxe(args: any) {
this.activate();
this.log.d("_haxe_ *%s*", args.join(" "));
return exec(".", [this.haxeBin].concat(args).join(" "));
}
haxelib(args: any) {
this.activate();
this.log.d("_haxelib_ *%s*", args.join(" "));
return exec(".", [this.haxelibBin].concat(args).join(" "));
}
@@ -201,17 +203,17 @@ export class Haxe extends Sdk {
}
install(packages: Record<string, string> | LibDef[]) {
this.activate();
let promise = this.haxelib(["setup", path.join(this.path, "lib")]);
const next = (args: any) => () => {
this.log.i("_haxelib_ _install_ *%s:%s*", args[1], args[2]);
return this.haxelib(args);
};
if (!Array.isArray(packages)) {
packages = Object.entries(packages).map(([k, v]) => ({ name: k, version: v }));
}
this.log.i("_install_ *%s*", packages.map((item) => `${item.name}:${item.version}`).join(" "));
this.activate();
let promise = this.haxelib(["setup", path.join(this.path, "lib")]);
const next = (args: any) => () => {
return this.haxelib(args);
};
for (let pack of packages) {
const args = [];
let version = null;
+1
View File
@@ -16,3 +16,4 @@ export * from "./impl/ruffle";
export * from "./preset";
export * from "./project";
export * from "./project/impl";
export * from "./task";
+4 -6
View File
@@ -1,16 +1,14 @@
import { branch, compile } from "../core/config";
import type { Config, PresetJson } from "../core/type";
import { Project } from "../project";
export default (preset: PresetJson): Project[] => {
export default (preset: PresetJson): Config[] => {
const config: Config = compile(preset["default"] || {});
const projects: Project[] = [];
const result: Config[] = [];
for (const [k, v] of Object.entries(preset)) {
if (k == "default") {
continue;
}
const projectConfig = branch(config, { ...v, name: k });
projects.push(new Project(projectConfig));
result.push(branch(config, { ...v, name: k }));
}
return projects;
return result;
};
-2
View File
@@ -1,12 +1,10 @@
import compiler from "./compiler";
import loader from "./loader";
import register from "./register";
import validator from "./validator";
export const Preset = {
compiler,
loader,
register,
validator,
};
+4 -3
View File
@@ -4,9 +4,9 @@ import os from "os";
import path from "path";
import template from "../common/template";
import { Sdk } from "../core/sdk";
import type { ConfigJson, ConfigSource, PackageJson, PresetJson } from "../core/type";
import { Platform, type ConfigJson, type ConfigSource, type PackageJson, type PresetJson } from "../core/type";
import { Haxe } from "../impl/haxe";
import { Project } from "../project";
import { RuffleRunner, Runner } from "../project";
export const DEFAULT_CONFIG_JSON: ConfigJson = {
SdkDir: "$HOME/sdk",
@@ -15,8 +15,9 @@ export const DEFAULT_CONFIG_JSON: ConfigJson = {
export const resolvePath = (path: string) => path.replace("$HOME", os.homedir());
export const applyConfig = (config: ConfigJson) => {
// TODO: ruffle kludge
if (config.UseRuffle) {
Project.useRuffle();
Runner.register(Platform.FLASH, RuffleRunner);
}
if (config.SdkDir) {
Sdk.dir = resolvePath(config.SdkDir);
-91
View File
@@ -1,91 +0,0 @@
import gulp from "gulp";
import gulpClean from "gulp-clean";
import type { Task } from "undertaker";
import { System } from "../common/system";
import { Platform } from "../core/type";
import { Haxe } from "../impl/haxe";
import { Builder, type Project } from "../project";
export default (projects: Project[]): Task => {
gulp.task("clean", () => {
return gulp.src("target/*", { read: false }).pipe(gulpClean());
});
const project = projects[0];
gulp.task("setup", () => {
return Promise.all(
project.config.platforms.map((platform) =>
Builder.new(project.config, platform, project.config.buildSystem).prepare(),
),
);
});
const protohx = project.hasLib("protohx");
if (protohx) {
gulp.task("protohx:generate", () =>
new Haxe().haxelib(["run", "protohx", "generate", "protohx.json"]).then((result: any) => {
if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout;
}
}),
);
}
for (const project of projects) {
project.register(gulp);
}
const defaultSeries: Task[] = [gulp.task("clean")!, gulp.task("setup")!];
if (protohx) {
defaultSeries.push(gulp.task("protohx:generate")!);
}
for (const project of projects) {
for (const platform of project.config.platforms) {
switch (platform) {
case Platform.FLASH:
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:html`)!);
break;
case Platform.HTML5:
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
break;
case Platform.LINUX:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:deb`)!);
}
break;
case Platform.CPP:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.NEKO:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.ANDROID:
if (System.isLinux) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
}
break;
case Platform.WINDOWS:
if (System.isWindows) {
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:build`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:archive`)!);
defaultSeries.push(gulp.task(`${project.config.name}:${platform}:installer`)!);
}
break;
}
}
}
const defaultTask = gulp.series(defaultSeries);
gulp.task("default", defaultTask);
return defaultTask;
};
+4 -4
View File
@@ -5,16 +5,16 @@ import { tail } from "../../common/tail";
import { type Config, Platform } from "../../core/type";
import { Target } from "./target";
export type RunnerFactory = new (config: Config, debug: boolean) => Runner;
export type RunnerFactory = new (config: Config, debug?: boolean) => Runner;
export class Runner extends Target {
static factory: Record<string, RunnerFactory> = {};
public debug: boolean;
constructor(config: Config, platform: Platform, debug: boolean) {
constructor(config: Config, platform: Platform, debug?: boolean) {
super(config, platform);
this.debug = debug;
this.debug = debug || false;
}
log(stream: any) {
@@ -25,7 +25,7 @@ export class Runner extends Target {
Runner.factory[platform] = runner;
}
static new(config: Config, platform: string, debug: boolean): Runner {
static new(config: Config, platform: string, debug?: boolean): Runner {
return new Runner.factory[platform](config, debug);
}
}
+1 -1
View File
@@ -12,7 +12,7 @@ export class Target {
this.target = "target";
}
prepare(): Promise<any> {
setup(): Promise<any> {
return Promise.resolve();
}
+1 -1
View File
@@ -16,7 +16,7 @@ export class HaxeBuilder extends Builder {
this.android = new Android();
}
prepare() {
setup() {
let result: Promise<any> = this.haxe.prepare().then(() => this.haxe.install(this.config.libs));
if (this.buildSystem === BuildSystem.OPENFL) {
if (this.platform === Platform.ANDROID) {
+1 -1
View File
@@ -12,7 +12,7 @@ export class WindowsInstallerPacker extends Packer {
this.innosetup = new InnoSetup();
}
prepare() {
setup() {
return this.innosetup.prepare();
}
+2 -2
View File
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
export class AndroidRunner extends Runner {
protected android: Android;
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, Platform.ANDROID, debug);
this.android = new Android();
}
prepare() {
setup() {
return this.android.prepare();
}
+2 -2
View File
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
export class FlashRunner extends Runner {
public player: FlashPlayer;
constructor(config: Config, debug: boolean, player: typeof FlashPlayer = FlashPlayer) {
constructor(config: Config, debug?: boolean, player: typeof FlashPlayer = FlashPlayer) {
super(config, Platform.FLASH, debug);
this.player = new player(debug);
}
prepare() {
setup() {
return this.player.prepare();
}
+1 -1
View File
@@ -3,7 +3,7 @@ import { type Config, Platform } from "../../../core/type";
import { Runner } from "../../core/runner";
export class Html5Runner extends Runner {
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, Platform.HTML5, debug);
}
+2 -2
View File
@@ -5,7 +5,7 @@ import run from "../../../run";
import { Runner } from "../../core/runner";
export class LinuxRunner extends Runner {
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, Platform.LINUX, debug);
}
@@ -20,7 +20,7 @@ export class LinuxRunner extends Runner {
Runner.register(Platform.LINUX, LinuxRunner);
export class CPPRunner extends LinuxRunner {
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, debug);
this.platform = Platform.CPP;
}
+2 -2
View File
@@ -6,12 +6,12 @@ import { Runner } from "../../core/runner";
export class NekoRunner extends Runner {
public neko: Neko;
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, Platform.NEKO, debug);
this.neko = new Neko();
}
prepare() {
setup() {
return this.neko.prepare();
}
+1 -1
View File
@@ -3,7 +3,7 @@ import { RufflePlayer } from "../../../impl/ruffle";
import { FlashRunner } from "./flash";
export class RuffleRunner extends FlashRunner {
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, debug, RufflePlayer);
}
}
+1 -1
View File
@@ -5,7 +5,7 @@ import run from "../../../run";
import { Runner } from "../../core/runner";
export class WindowsRunner extends Runner {
constructor(config: Config, debug: boolean) {
constructor(config: Config, debug?: boolean) {
super(config, Platform.WINDOWS, debug);
}
-75
View File
@@ -1,77 +1,2 @@
import gulp from "gulp";
import type { Task, TaskFunction } from "undertaker";
import { Platform, type Config } from "../core/type";
import { Builder } from "./core/builder";
import { Packer } from "./core/packer";
import { Runner } from "./core/runner";
import { RuffleRunner } from "./impl/runner/ruffle";
export * from "./core";
export * from "./impl";
export class Project {
public config: Config;
constructor(config: Config) {
this.config = config;
}
hasLib(name: string): boolean {
for (const lib of this.config.libs) {
if (lib.name === name) {
return true;
}
}
return false;
}
build(platform: Platform, debug: boolean = false): Task[] {
const builder = Builder.new(this.config, platform, this.config.buildSystem, debug);
const tasks: Task[] = [builder.prepare.bind(builder)];
tasks.push(builder.call.bind(builder));
return tasks;
}
run(platform: Platform, debug: boolean = false): Task[] {
const runner = Runner.new(this.config, platform, debug);
return [runner.prepare.bind(runner), runner.call.bind(runner)];
}
test(platform: Platform, debug: boolean = true): Task[] {
return this.build(platform, debug).concat(this.run(platform, debug));
}
pack(platform: Platform, name: string) {
const packer = Packer.new(this.config, platform, name);
return [packer.prepare.bind(packer), packer.call.bind(packer)];
}
compile(external_gulp?: gulp.Gulp): Record<string, TaskFunction> {
const result: Record<string, TaskFunction> = {};
const _gulp = external_gulp || gulp;
for (const platform of this.config.platforms) {
result[`${this.config.name}:${platform}:build`] = _gulp.series(this.build(platform));
if (Runner.factory[platform]) {
result[`${this.config.name}:${platform}:run`] = _gulp.series(this.run(platform));
result[`${this.config.name}:${platform}:test`] = _gulp.series(this.test(platform));
}
if (Packer.factory[platform]) {
for (const name of Object.keys(Packer.factory[platform])) {
result[`${this.config.name}:${platform}:${name}`] = _gulp.series(this.pack(platform, name));
}
}
}
return result;
}
register(external_gulp?: gulp.Gulp) {
const _gulp = external_gulp || gulp;
for (const [k, v] of Object.entries(this.compile(_gulp))) {
_gulp.task(k, v);
}
}
// TODO:
static useRuffle() {
Runner.register(Platform.FLASH, RuffleRunner);
}
}
+29
View File
@@ -0,0 +1,29 @@
import { branch, compile } from "../core/config";
import type { Config } from "../core/type";
import type { TaskBundle, TaskCompilerType } from "./core";
import { CleanTaskCompiler } from "./impl/clean";
import { FormatTaskCompiler } from "./impl/format";
import { ProjectTaskCompiler } from "./impl/project";
import { ProtoTaskCompiler } from "./impl/proto";
import { SetupTaskCompiler } from "./impl/setup";
const COMPILERS: TaskCompilerType[] = [FormatTaskCompiler, CleanTaskCompiler, SetupTaskCompiler, ProtoTaskCompiler];
const PROJECT_COMPILERS: TaskCompilerType[] = [ProjectTaskCompiler];
export default (projects: Config[]): TaskBundle => {
const bundle: TaskBundle = {};
const config = projects.reduce((config, project) => branch(config, project), compile({}));
for (const compiler of COMPILERS) {
for (const [name, task] of Object.entries(new compiler(config).compile())) {
bundle[name] = task;
}
}
for (const compiler of PROJECT_COMPILERS) {
for (const project of projects) {
for (const [name, task] of Object.entries(new compiler(project).compile())) {
bundle[name] = task;
}
}
}
return bundle;
};
+22
View File
@@ -0,0 +1,22 @@
import type { TaskFunction } from "gulp";
import type { Config } from "../core/type";
export type TaskBundle = Record<string, TaskFunction>;
export interface TaskCompiler {
config: Config;
debug?: boolean;
compile(): TaskBundle;
}
export abstract class TaskCompilerImpl implements TaskCompiler {
constructor(
public config: Config,
public debug?: boolean,
) {}
abstract compile(): TaskBundle;
}
export type TaskCompilerType = new (config: Config, debug?: boolean) => TaskCompiler;
+13
View File
@@ -0,0 +1,13 @@
import gulp from "gulp";
import gulpClean from "gulp-clean";
import { TaskCompilerImpl, type TaskBundle } from "../core";
export class CleanTaskCompiler extends TaskCompilerImpl {
compile(): TaskBundle {
return {
clean: () => {
return gulp.src("target/*", { read: false }).pipe(gulpClean());
},
};
}
}
+27
View File
@@ -0,0 +1,27 @@
import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskBundle } from "../core";
export class FormatTaskCompiler extends TaskCompilerImpl {
compile(): TaskBundle {
return {
check: async () => {
const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" });
await haxe.haxelib(
["run", "formatter", "--check"].concat(
this.config.sources.reduce<string[]>((sources, source) => sources.concat(["-s", source]), []),
),
);
},
format: async () => {
const haxe = new Haxe(this.config.haxe);
await haxe.install({ formatter: "" });
await haxe.haxelib(
["run", "formatter"].concat(
this.config.sources.reduce<string[]>((sources, source) => sources.concat(["-s", source]), []),
),
);
},
};
}
}
+31
View File
@@ -0,0 +1,31 @@
import gulp from "gulp";
import { Builder, Packer, Runner } from "../../project";
import { TaskCompilerImpl, type TaskBundle } from "../core";
export class ProjectTaskCompiler extends TaskCompilerImpl {
compile(): TaskBundle {
const tasks: TaskBundle = {};
for (const platform of this.config.platforms) {
const builder = Builder.new(this.config, platform, this.config.buildSystem, this.debug);
const setupKey = `${this.config.name}:${platform}:setup`;
const buildKey = `${this.config.name}:${platform}:build`;
tasks[setupKey] = builder.setup.bind(builder);
tasks[buildKey] = gulp.series(builder.setup.bind(builder), builder.call.bind(builder));
if (Runner.factory[platform]) {
const testKey = `${this.config.name}:${platform}:test`;
const runner = Runner.new(this.config, platform, this.debug);
tasks[testKey] = gulp.series(builder.setup.bind(builder), runner.setup.bind(runner), runner.call.bind(runner));
}
if (Packer.factory[platform]) {
for (const name of Object.keys(Packer.factory[platform])) {
const packKey = `${this.config.name}:${platform}:${name}`;
const packer = Packer.new(this.config, platform, name);
tasks[packKey] = gulp.series(packer.setup.bind(packer), packer.call.bind(packer));
}
}
}
return tasks;
}
}
+16
View File
@@ -0,0 +1,16 @@
import { Haxe } from "../../impl/haxe";
import { TaskCompilerImpl, type TaskBundle } from "../core";
export class ProtoTaskCompiler extends TaskCompilerImpl {
compile(): TaskBundle {
return {
"protohx:generate": async () => {
const haxe = new Haxe(this.config.haxe);
const result = await haxe.haxelib(["run", "protohx", "generate", "protohx.json"]);
if (result.stdout.indexOf("FAIL") > -1) {
throw result.stdout;
}
},
};
}
}
+14
View File
@@ -0,0 +1,14 @@
import { Builder } from "../../project";
import { TaskCompilerImpl, type TaskBundle } from "../core";
export class SetupTaskCompiler extends TaskCompilerImpl {
compile(): TaskBundle {
return {
clean: () => {
return Promise.all(
this.config.platforms.map((platform) => Builder.new(this.config, platform, this.config.buildSystem).setup()),
);
},
};
}
}
+12
View File
@@ -0,0 +1,12 @@
import compiler from "./compiler";
import register from "./register";
export * from "./core";
export * from "./impl/format";
export * from "./impl/project";
export const Task = {
compiler,
register,
};
export default Task;
+8
View File
@@ -0,0 +1,8 @@
import gulp from "gulp";
import type { TaskBundle } from "./core";
export default (tasks: TaskBundle) => {
for (const [name, task] of Object.entries(tasks)) {
gulp.task(name, task);
}
};