Merge pull request #242 from code0-tech/fix/ts-tooling

Fix tucana typescript tooling

Author: Taucher2003

build/ts/.gitignore

@@ -1,3 +1,3 @@
 node_modules/
-pb/*
-!pb/.gitkeep
+pb/
+!pb/_generated/.gitkeep

build/ts/helpers/helpers.ts

@@ -0,0 +1 @@
+export * from "./shared.struct_helper";

build/ts/helpers/shared.struct_helper.ts

@@ -1,4 +1,4 @@
-import {Value} from "../pb/shared.struct_pb.js";
+import {Value} from "../pb/shared";
 
 export type PlainValue = null | number | string | boolean | Array<PlainValue> | object;
 

build/ts/package.json

@@ -15,23 +15,42 @@
   "type": "module",
   "main": "index.js",
   "scripts": {
-    "generate:aquila": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript_es2020 --ts_out=pb --proto_path=../../proto/aquila --proto_path=../../proto/shared ../../proto/aquila/*.proto",
-    "generate:sagittarius": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript_es2020 --ts_out=pb --proto_path=../../proto/sagittarius --proto_path=../../proto/shared ../../proto/sagittarius/*.proto",
-    "generate:shared": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript_es2020 --ts_out=pb --proto_path=../../proto/shared ../../proto/shared/*.proto",
-    "generate": "npm run generate:shared && npm run generate:sagittarius && npm run generate:aquila"
+    "generate:aquila": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript --ts_opt=generate_dependencies --ts_out=pb/_generated --proto_path=../../proto/aquila --proto_path=../../proto/shared ../../proto/aquila/*.proto",
+    "generate:sagittarius": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript --ts_opt=generate_dependencies --ts_out=pb/_generated --proto_path=../../proto/sagittarius --proto_path=../../proto/shared ../../proto/sagittarius/*.proto",
+    "generate:shared": "protoc --ts_opt=add_pb_suffix --ts_opt=output_javascript --ts_opt=generate_dependencies --ts_out=pb/_generated --proto_path=../../proto/shared ../../proto/shared/*.proto",
+    "generate": "npm run generate:shared && npm run generate:sagittarius && npm run generate:aquila && npm run generate:exports",
+    "generate:exports": "node scripts/generateExports.mjs"
   },
   "devDependencies": {
     "@protobuf-ts/plugin": "^2.11.1",
     "protoc": "^34.0.0"
   },
   "files": [
-    "helpers/*.ts",
-    "helpers/*.js",
-    "pb/*.ts",
-    "pb/*.js",
+    "pb",
+    "helpers",
+    "index.ts",
     "index.js",
+    "index.d.ts",
     "package.json"
   ],
+  "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.js"
+    },
+    "./shared": {
+      "import": "./pb/shared.js"
+    },
+    "./aquila": {
+      "import": "./pb/aquila.js"
+    },
+    "./sagittarius": {
+      "import": "./pb/sagittarius.js"
+    },
+    "./helpers": {
+      "import": "./helpers/helpers.js"
+    }
+  },
   "publishConfig": {
     "access": "public"
   }

build/ts/pb/.gitkeep build/ts/pb/_generated/.gitkeepbuild/ts/pb/.gitkeep renamed to build/ts/pb/_generated/.gitkeep

@@ -0,0 +1,17 @@
+import { readdirSync, writeFileSync } from "fs";
+import { resolve } from "path";
+
+const files = {}
+
+readdirSync(resolve('./pb/_generated')).forEach((file) => {
+    if (!file.endsWith('.js') && !file.endsWith('.ts')) return;
+
+    const category = file.split('.')[0];
+    files[category] ||= [];
+    files[category].push(file);
+});
+
+Object.entries(files).forEach(([category, categoryFiles]) => {
+    const fileContent = categoryFiles.map(file => `export * from "./_generated/${file.replace('.ts', '.js')}";`).join('\n');
+    writeFileSync(`./pb/${category}.ts`, `${fileContent}\n`);
+});

build/ts/scripts/generateExports.mjs

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
+    "target": "ES2020",
     "lib": ["ES2017", "DOM"],
     "module": "commonjs",
     "strict": true