From 3e14440180a9d66c2aae315a50aea625c8cc6a9d Mon Sep 17 00:00:00 2001 From: Peter Fajdiga Date: Wed, 17 Apr 2024 22:56:06 +0200 Subject: [PATCH] create a typescript project for each generator script --- Makefile | 9 ++++----- run-ts.sh | 2 ++ .../kcfg.ts => src/generators/config/main.ts | 0 src/generators/config/tsconfig.json | 4 ++++ .../generators}/docs/keyBindings.ts | 15 --------------- .../generators/docs/keyBindingsBbcode/main.ts | 0 .../docs/keyBindingsBbcode/tsconfig.json | 8 ++++++++ .../generators/docs/keyBindingsFmt/main.ts | 0 src/generators/docs/keyBindingsFmt/tsconfig.json | 8 ++++++++ .../generators/docs/keyBindingsTable/main.ts | 0 .../docs/keyBindingsTable/tsconfig.json | 8 ++++++++ 11 files changed, 34 insertions(+), 20 deletions(-) create mode 100755 run-ts.sh rename generators/config/kcfg.ts => src/generators/config/main.ts (100%) create mode 100644 src/generators/config/tsconfig.json rename {generators => src/generators}/docs/keyBindings.ts (83%) rename generators/docs/keyBindingsBbcode.ts => src/generators/docs/keyBindingsBbcode/main.ts (100%) create mode 100644 src/generators/docs/keyBindingsBbcode/tsconfig.json rename generators/docs/keyBindingsFmt.ts => src/generators/docs/keyBindingsFmt/main.ts (100%) create mode 100644 src/generators/docs/keyBindingsFmt/tsconfig.json rename generators/docs/keyBindingsTable.ts => src/generators/docs/keyBindingsTable/main.ts (100%) create mode 100644 src/generators/docs/keyBindingsTable/tsconfig.json diff --git a/Makefile b/Makefile index 158fd1d..4c95dd4 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,10 @@ .PHONY: * -TSC_SCRIPT_FLAGS = --lib es2020 ./src/extern/qt.d.ts VERSION = $(shell grep '"Version":' ./package/metadata.json | grep -o '[0-9\.]*') config: mkdir -p ./package/contents/config - tsc ${TSC_SCRIPT_FLAGS} ./src/config/definition.ts ./generators/config/kcfg.ts --outFile /dev/stdout | node - > ./package/contents/config/main.xml + ./run-ts.sh ./src/generators/config > ./package/contents/config/main.xml build: tsc -p ./src/main --outFile ./package/contents/code/main.js @@ -23,10 +22,10 @@ logs: journalctl -t kwin_x11 -g '^qml:|^file://.*karousel' -f docs-key-bindings-bbcode: - @tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsBbcode.ts --outFile /dev/stdout | node - + @./run-ts.sh ./src/generators/docs/keyBindingsBbcode docs-key-bindings-table: - @tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsTable.ts --outFile /dev/stdout | node - + @./run-ts.sh ./src/generators/docs/keyBindingsTable docs-key-bindings-fmt: - @tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsFmt.ts --outFile /dev/stdout | node - + @./run-ts.sh ./src/generators/docs/keyBindingsFmt diff --git a/run-ts.sh b/run-ts.sh new file mode 100755 index 0000000..d616b44 --- /dev/null +++ b/run-ts.sh @@ -0,0 +1,2 @@ +#!/bin/bash +tsc -p "$1" --outFile /dev/stdout | node - diff --git a/generators/config/kcfg.ts b/src/generators/config/main.ts similarity index 100% rename from generators/config/kcfg.ts rename to src/generators/config/main.ts diff --git a/src/generators/config/tsconfig.json b/src/generators/config/tsconfig.json new file mode 100644 index 0000000..0fcc3ed --- /dev/null +++ b/src/generators/config/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../../tsconfig.json", + "include": ["../../lib/**/*", "./**/*"] +} diff --git a/generators/docs/keyBindings.ts b/src/generators/docs/keyBindings.ts similarity index 83% rename from generators/docs/keyBindings.ts rename to src/generators/docs/keyBindings.ts index ff8bbaa..1b4bc24 100644 --- a/generators/docs/keyBindings.ts +++ b/src/generators/docs/keyBindings.ts @@ -1,18 +1,3 @@ -type KeyBinding = { - name: string; - description: string; - comment?: string; - defaultKeySequence: string; -} - -type NumKeyBinding = { - name: string; - description: string; - comment?: string; - defaultModifiers: string; - fKeys: boolean; -} - function formatComment(comment: string | undefined) { return comment === undefined ? "" : ` (${comment})`; } diff --git a/generators/docs/keyBindingsBbcode.ts b/src/generators/docs/keyBindingsBbcode/main.ts similarity index 100% rename from generators/docs/keyBindingsBbcode.ts rename to src/generators/docs/keyBindingsBbcode/main.ts diff --git a/src/generators/docs/keyBindingsBbcode/tsconfig.json b/src/generators/docs/keyBindingsBbcode/tsconfig.json new file mode 100644 index 0000000..6204e4a --- /dev/null +++ b/src/generators/docs/keyBindingsBbcode/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.json", + "include": [ + "../../../lib/**/*", + "../keyBindings.ts", + "./**/*" + ] +} diff --git a/generators/docs/keyBindingsFmt.ts b/src/generators/docs/keyBindingsFmt/main.ts similarity index 100% rename from generators/docs/keyBindingsFmt.ts rename to src/generators/docs/keyBindingsFmt/main.ts diff --git a/src/generators/docs/keyBindingsFmt/tsconfig.json b/src/generators/docs/keyBindingsFmt/tsconfig.json new file mode 100644 index 0000000..6204e4a --- /dev/null +++ b/src/generators/docs/keyBindingsFmt/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.json", + "include": [ + "../../../lib/**/*", + "../keyBindings.ts", + "./**/*" + ] +} diff --git a/generators/docs/keyBindingsTable.ts b/src/generators/docs/keyBindingsTable/main.ts similarity index 100% rename from generators/docs/keyBindingsTable.ts rename to src/generators/docs/keyBindingsTable/main.ts diff --git a/src/generators/docs/keyBindingsTable/tsconfig.json b/src/generators/docs/keyBindingsTable/tsconfig.json new file mode 100644 index 0000000..6204e4a --- /dev/null +++ b/src/generators/docs/keyBindingsTable/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.json", + "include": [ + "../../../lib/**/*", + "../keyBindings.ts", + "./**/*" + ] +}