diff --git a/haxetool.schema.json b/assets/haxetool.schema.json similarity index 100% rename from haxetool.schema.json rename to assets/haxetool.schema.json diff --git a/assets/icon.jpg b/assets/icon.jpg new file mode 100644 index 0000000..7dbb6ef Binary files /dev/null and b/assets/icon.jpg differ diff --git a/example/haxetool.json b/example/haxetool.json index f90e350..fb25527 100644 --- a/example/haxetool.json +++ b/example/haxetool.json @@ -3,14 +3,6 @@ "buildSystem": "openfl", "platforms": ["flash", "html5", "linux", "windows", "android"], "config": { - "meta": { - "title": "Example", - "filename": "example", - "icon": "./resources/icon.jpg", - "pack": "com.example", - "author": "Anonim ", - "company": "Any company" - }, "libs": { "lime": "8.3.2", "openfl": "9.5.2", diff --git a/package-lock.json b/package-lock.json index e777c1a..063da23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "vinyl-fs": "^4.0.2" }, "bin": { - "gulp-haxetool": "dist/bin/cli.mjs" + "hxt": "dist/bin/cli.mjs" }, "devDependencies": { "@types/async": "^3.2.26", diff --git a/package.json b/package.json index 5ac0f11..ed8a9ed 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gulp-haxetool", "type": "module", "version": "1.2.0", - "description": "HaXe Tool for Gulp", + "description": "HaXe Tool with Gulp", "exports": { "./bin/cli": "./dist/bin/cli.mjs", "./lib": "./dist/lib/index.mjs", @@ -13,7 +13,6 @@ }, "types": "./dist/lib/index.d.mts", "files": [ - "template", "dist" ], "scripts": { diff --git a/src/cli.ts b/src/cli.ts index 3a59bf1..61afb85 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,34 +1,14 @@ #!/usr/bin/env node -import Ajv from "ajv"; -import fs from "fs"; import gulp from "gulp"; -import path from "path"; -import { fileURLToPath } from "url"; -import { Preset, type ProjectPreset } from "."; import { name, version } from "../package.json" with { type: "json" }; +import compiler from "./preset/compiler"; +import loader from "./preset/loader"; +import register from "./preset/register"; +import validator from "./preset/validator"; console.log(`[${name} ${version}]`); -const loadPreset = (): Preset => { - const __filename = fileURLToPath(import.meta.url); - const __dirname = path.dirname(__filename); - - const presetData: Record = JSON.parse(fs.readFileSync("haxetool.json", "utf8")); - const ajv = new Ajv(); - const presetSchema = ajv.compile( - JSON.parse(fs.readFileSync(path.join(__dirname, "..", "haxetool.schema.json"), "utf-8")), - ); - const valid = presetSchema(presetData); - if (!valid) { - throw presetSchema.errors; - } - - const packageInfo = JSON.parse(fs.readFileSync("package.json", "utf8")); - const configData = fs.existsSync("config.json") ? JSON.parse(fs.readFileSync("config.json", "utf8")) : null; - return new Preset(presetData, configData, packageInfo); -}; - const showTasks = () => { const tree = gulp.tree({ deep: true }); console.log(tree.nodes.map((node) => node.label).join("\n")); @@ -47,8 +27,10 @@ const runTask = async (name: string) => { }; export const main = async () => { - const preset = loadPreset(); - preset.register(gulp); + const preset = loader(); + validator(preset); + const projects = compiler(preset); + register(projects); if (process.argv.length > 2) { await runTask(process.argv[2]); diff --git a/src/common/asset.ts b/src/common/asset.ts new file mode 100644 index 0000000..db230ff --- /dev/null +++ b/src/common/asset.ts @@ -0,0 +1,9 @@ +import path from "path"; +import { fileURLToPath } from "url"; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +export default (name: string): string => { + return path.join(__dirname, "..", "assets", name); +}; diff --git a/src/common/template.ts b/src/common/template.ts index 6af18f1..86eea29 100644 --- a/src/common/template.ts +++ b/src/common/template.ts @@ -7,7 +7,7 @@ const __dirname = path.dirname(__filename); export default new Eta({ autoFilter: true, - filterFunction: (val: unknown): string => (val === null ? "" : String(val)), + filterFunction: (val: unknown): string => (val === null || val === undefined ? "" : String(val)), useWith: true, views: path.join(__dirname, "..", "template"), }); diff --git a/src/core/config.ts b/src/core/config.ts index a724c33..782ff57 100644 --- a/src/core/config.ts +++ b/src/core/config.ts @@ -121,10 +121,10 @@ export class Config { } afterUpdate() { - if (this.meta.mobileWidth === null) { + if (this.meta.mobileWidth === undefined) { this.meta.mobileWidth = this.meta.width; } - if (this.meta.mobileHeight === null && this.meta.mobileWidth) { + if (this.meta.mobileHeight === undefined && this.meta.mobileWidth) { this.meta.mobileHeight = Math.round(this.meta.mobileWidth / 2.222222222); } } diff --git a/src/index.ts b/src/index.ts index a2daaf5..fdb5cbb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,6 +11,6 @@ export * from "./impl/haxe"; export * from "./impl/innosetup"; export * from "./impl/neko"; export * from "./impl/ruffle"; +export * from "./preset"; export * from "./project"; export * from "./project/impl"; -export * from "./project/preset"; diff --git a/src/preset/compiler.ts b/src/preset/compiler.ts new file mode 100644 index 0000000..fef4e1f --- /dev/null +++ b/src/preset/compiler.ts @@ -0,0 +1,16 @@ +import { Config } from "../core/config"; +import { Project } from "../project"; +import type { PresetBundle } from "./type"; + +export default (preset: PresetBundle): Project[] => { + const config = new Config(preset["default"]?.config || {}); + const projects: Project[] = []; + for (const [k, v] of Object.entries(preset)) { + if (k == "default") { + continue; + } + const projectConfig = config.branch({ ...v.config, name: k }); + projects.push(new Project(v.buildSystem!, v.platforms!, projectConfig)); + } + return projects; +}; diff --git a/src/preset/index.ts b/src/preset/index.ts new file mode 100644 index 0000000..b47d9d9 --- /dev/null +++ b/src/preset/index.ts @@ -0,0 +1 @@ +export * from "./type"; diff --git a/src/preset/loader.ts b/src/preset/loader.ts new file mode 100644 index 0000000..8ca5a5a --- /dev/null +++ b/src/preset/loader.ts @@ -0,0 +1,63 @@ +import dateformat from "dateformat"; +import fs from "fs"; +import os from "os"; +import path from "path"; +import template from "../common/template"; +import { Sdk } from "../core/sdk"; +import { Haxe } from "../impl/haxe"; +import { Project } from "../project"; +import type { ConfigJson, PackageJson, Preset, PresetBundle } from "./type"; + +export const DEFAULT_CONFIG: ConfigJson = { + SdkDir: "$HOME/sdk", +}; + +export const resolvePath = (path: string) => path.replace("$HOME", os.homedir()); + +export const applyConfig = (config: ConfigJson) => { + if (config.UseRuffle) { + Project.useRuffle(); + } + if (config.SdkDir) { + Sdk.dir = resolvePath(config.SdkDir); + } + if (config.BuildDir) { + Haxe.buildDir = resolvePath(config.BuildDir); + } +}; + +export default (basedir: string = "."): PresetBundle => { + const presetFile = path.join(basedir, "haxetool.json"); + const configFile = path.join(basedir, "config.json"); + const packageFile = path.join(basedir, "package.json"); + const presetJson: PresetBundle = JSON.parse(fs.readFileSync(presetFile, "utf8")); + const configJson: ConfigJson = { + ...DEFAULT_CONFIG, + ...(fs.existsSync(configFile) ? JSON.parse(fs.readFileSync(configFile, "utf8")) : {}), + }; + applyConfig(configJson); + const packageJson: PackageJson = fs.existsSync(packageFile) ? JSON.parse(fs.readFileSync(packageFile, "utf8")) : {}; + for (const [k, v] of Object.entries(presetJson)) { + presetJson[k] = JSON.parse( + template.renderString(JSON.stringify(v), { + config: configJson, + package: packageJson, + env: process.env, + dateformat: dateformat, + }), + ); + } + const defaultPreset: Preset = presetJson["default"] || { config: {} }; + defaultPreset.config.meta = { + ...{ + title: packageJson.name, + filename: packageJson.name, + version: packageJson.version, + pack: `com.${packageJson.name}`, + author: packageJson.author as string, + }, + ...(defaultPreset.config.meta || {}), + }; + presetJson["default"] = defaultPreset; + return presetJson; +}; diff --git a/src/project/preset.ts b/src/preset/manager.ts similarity index 68% rename from src/project/preset.ts rename to src/preset/manager.ts index 2ad9828..04fc233 100644 --- a/src/project/preset.ts +++ b/src/preset/manager.ts @@ -3,72 +3,21 @@ import gulp from "gulp"; import gulpClean from "gulp-clean"; import os from "os"; import type { Task } from "undertaker"; -import { Builder, Project } from "."; import { System } from "../common/system"; import template from "../common/template"; -import { Config, type ConfigParams, type SignKey } from "../core/config"; +import { Config } from "../core/config"; import { Sdk } from "../core/sdk"; -import { BuildSystem, Platform } from "../core/type"; +import { Platform } from "../core/type"; import { Haxe } from "../impl/haxe"; +import { Builder, Project } from "../project"; +import type { ConfigJson, PackageJson, Preset, PresetJson } from "./type"; -export interface PresetConfig { - SdkDir?: string; - BuildDir?: string; - Develop?: boolean; - UseRuffle?: boolean; - Key?: SignKey; -} - -export const DEFAULT_CONFIG: PresetConfig = { +export const DEFAULT_CONFIG: ConfigJson = { SdkDir: "$HOME/sdk", }; -export interface ProjectPreset { - buildSystem?: BuildSystem; - platforms?: Platform[]; - config: ConfigParams; -} +export class PresetOperator { -export class Preset { - public options: Record; - public config: PresetConfig; - public packageInfo: Record; - - constructor(options: Record, config?: PresetConfig, packageInfo?: Record) { - this.config = { ...DEFAULT_CONFIG, ...(config || {}) }; - this.packageInfo = packageInfo || {}; - for (const [k, v] of Object.entries(options)) { - options[k] = this.fillPreset(v); - } - this.options = options; - } - - private fillPreset(preset: ProjectPreset): ProjectPreset { - return JSON.parse( - template.renderString(JSON.stringify(preset), { - config: this.config, - package: this.packageInfo, - env: process.env, - dateformat: dateformat, - }), - ); - } - - compile(): Project[] { - const config = new Config({ - meta: { version: this.packageInfo.version }, - ...(this.options["default"]?.config || {}), - }); - const projects: Project[] = []; - for (const [k, v] of Object.entries(this.options)) { - if (k == "default") { - continue; - } - const projectConfig = config.branch({ ...v.config, name: k }); - projects.push(new Project(v.buildSystem!, v.platforms!, projectConfig)); - } - return projects; - } register(external_gulp?: gulp.Gulp, additional_tasks?: string[]) { const _gulp = external_gulp || gulp; diff --git a/src/preset/register.ts b/src/preset/register.ts new file mode 100644 index 0000000..fc718e7 --- /dev/null +++ b/src/preset/register.ts @@ -0,0 +1,93 @@ +import defaultGulp 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[], gulp?: defaultGulp.Gulp): Task => { + if (!gulp) { + gulp = defaultGulp; + } + + gulp.task("clean", () => { + return gulp.src("target/*", { read: false }).pipe(gulpClean()); + }); + + const project = projects[0]; + + gulp.task("setup", () => { + return Promise.all( + project.platforms.map((platform) => Builder.new(project.config, platform, project.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.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; +}; diff --git a/src/preset/type.ts b/src/preset/type.ts new file mode 100644 index 0000000..4eccd67 --- /dev/null +++ b/src/preset/type.ts @@ -0,0 +1,20 @@ +import type { ConfigParams, SignKey } from "../core/config"; +import type { BuildSystem, Platform } from "../core/type"; + +export type PackageJson = Record; + +export interface ConfigJson { + SdkDir?: string; + BuildDir?: string; + Develop?: boolean; + UseRuffle?: boolean; + Key?: SignKey; +} + +export interface Preset { + buildSystem?: BuildSystem; + platforms?: Platform[]; + config: ConfigParams; +} + +export type PresetBundle = Record; diff --git a/src/preset/validator.ts b/src/preset/validator.ts new file mode 100644 index 0000000..24a2e0d --- /dev/null +++ b/src/preset/validator.ts @@ -0,0 +1,13 @@ +import Ajv from "ajv"; +import fs from "fs"; +import asset from "../common/asset"; +import type { PresetBundle } from "./type"; + +export default (preset: PresetBundle) => { + const ajv = new Ajv(); + const presetSchema = ajv.compile(JSON.parse(fs.readFileSync(asset("haxetool.schema.json"), "utf-8"))); + const valid = presetSchema(preset); + if (!valid) { + throw presetSchema.errors; + } +}; diff --git a/src/project/impl/packer/linux/deb.ts b/src/project/impl/packer/linux/deb.ts index 34eff1f..03117f3 100644 --- a/src/project/impl/packer/linux/deb.ts +++ b/src/project/impl/packer/linux/deb.ts @@ -4,6 +4,7 @@ import gulp from "gulp"; import deb from "gulp-debian"; import os from "os"; import path from "path"; +import asset from "../../../../common/asset"; import template from "../../../../common/template"; import { Config } from "../../../../core/config"; import { Platform } from "../../../../core/type"; @@ -11,6 +12,7 @@ import { Packer } from "../../../core/packer"; export class LinuxDEBPacker extends Packer { static NAME = "deb"; + static DEFAULT_ICON = asset("icon.jpg"); constructor(config: Config) { super(config, Platform.LINUX); @@ -19,12 +21,13 @@ export class LinuxDEBPacker extends Packer { call() { const target = this.targetPath; const buildDir = path.join(os.tmpdir(), "build", this.config.name, "debian"); - const iconfile = `${this.config.meta.filename}${path.extname(this.config.meta.icon!)}`; + const icon = this.config.meta.icon || LinuxDEBPacker.DEFAULT_ICON; + const iconfile = `${this.config.meta.filename}${path.extname(icon)}`; const desktop = template.render("linux/app.desktop", { iconfile: iconfile, ...this.config }); fse.ensureDirSync(`${buildDir}/usr/share/applications`); fs.writeFileSync(`${buildDir}/usr/share/applications/${this.config.meta.filename}.desktop`, desktop); fse.copySync(`${target}`, `${buildDir}/usr/share/${this.config.meta.filename}/`); - fse.copySync(this.config.meta.icon!, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`); + fse.copySync(icon, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`); return gulp.src(`${buildDir}/*`).pipe( deb({ package: this.config.meta.filename!, diff --git a/src/project/index.ts b/src/project/index.ts index 7a1ce3f..c917aed 100644 --- a/src/project/index.ts +++ b/src/project/index.ts @@ -7,6 +7,7 @@ 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 buildSystem: BuildSystem; diff --git a/tsdown.config.ts b/tsdown.config.ts index 8844093..e3caf21 100644 --- a/tsdown.config.ts +++ b/tsdown.config.ts @@ -5,7 +5,7 @@ export default defineConfig({ "bin/cli": "src/cli.ts", "lib/index": "src/index.ts", }, - copy: ["haxetool.schema.json"], + copy: ["assets", "template"], dts: { tsgo: true, },