refactor: directory structure

common/tsconfig/default.json

@@ -1,20 +1,20 @@
-{
-    "extends": "./base.json",
-    "compilerOptions": {
-        "lib": ["ESNext"],
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "target": "ESNext",
-        "outDir": "dist",
-        "sourceMap": false,
-        "esModuleInterop": true,
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
-        "allowSyntheticDefaultImports": true,
-        "skipLibCheck": true,
-        "skipDefaultLibCheck": true,
-        "resolveJsonModule": true,
-        "importHelpers": true,
-        "rootDirs": ["src", "lib"]
-    }
-}
+{
+    "extends": "./base.json",
+    "compilerOptions": {
+        "lib": ["ESNext"],
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "target": "ESNext",
+        "outDir": "dist",
+        "sourceMap": false,
+        "esModuleInterop": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "allowSyntheticDefaultImports": true,
+        "skipLibCheck": true,
+        "skipDefaultLibCheck": true,
+        "resolveJsonModule": true,
+        "importHelpers": true,
+        "rootDirs": ["src", "lib"]
+    }
+}

common/tsconfig/package.json

@@ -5,6 +5,6 @@
   "files": [
     "base.json",
     "nextjs.json",
-    "react-library.json"
+    "default.json"
   ]
 }

package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "workspaces": [
-    "libs/*",
-    "packages/*/*"
+    "common/*/",
+    "packages/*/*/"
   ],
   "scripts": {
     "build": "turbo run build",

packages/bot/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "extends": "tsconfig/default.json",
-  "include": ["**/*.ts", "environment.d.ts", "javascript/src/index.js", "javascript/src/structures/Event.js", "javascript/src/structures/Command.js", "javascript/src/structures/Client.js", "javascript/src/events/ready.js", "javascript/src/commands/hi.js"],
-  "exclude": ["node_modules", "**/*.spec.ts"]
-}

packages/bot/typescript/src/typings/command.ts

@@ -1,23 +0,0 @@
-import { Embed, Member, Message, User } from "guilded.js";
-import { ExtendedClient } from "../structures/Client";
-
-
-export type ResCtx = {
-    meta:
-    {
-        user: Member, 
-        raw: Message,
-    },
-    ctx:
-    {
-        getOptions: () => null|string[],
-        reply: (content: string|Embed) => void
-    }
-};
-
-
-export type CommandType = {
-    name: string,
-    description: string,
-    run: (context: { interaction: ResCtx }) => {}
-}

packages/bot/typescript/src/typings/events.ts

@@ -1,4 +0,0 @@
-import { ClientEvents } from 'guilded.js'
-export type extendedEvents = ClientEvents & {
-    interactionCreate: (...args) => unknown
-}

packages/bot/typescript/tsconfig.json

@@ -1,4 +0,0 @@
-{
-    "extends": "../tsconfig.json",
-}
-  

packages/cli/lib/validateClient.ts

@@ -0,0 +1,10 @@
+import * as logger from "../utils/logger"
+
+export default function verify() {
+    const NODE_VERSION = process.version.split("v")[1] as unknown as number
+
+    if (NODE_VERSION !>= 12) {
+        logger.error(`Detected node ${NODE_VERSION}. At least node v12 required.`)
+        process.exit(1)
+    }
+}

packages/cli/package.json

@@ -8,8 +8,8 @@
   },
   "scripts": {
     "build": "tsc",
-    "dev": "ts-node-dev src/index.ts",
-    "start": "ts-node src/index.ts"
+    "dev": "ts-node-dev ./src/index.ts",
+    "start": "ts-node ./src/index.ts"
   },
   "keywords": [],
   "author": "",
@@ -19,6 +19,7 @@
   ],
   "dependencies": {
     "axios": "^1.1.3",
+    "eslint-config-custom": "workspace:*",
     "fs-extra": "^10.1.0",
     "inquirer": "8.2.3",
     "kleur": "^4.1.5",

packages/cli/src/index.ts

@@ -10,6 +10,7 @@ import constants from "../lib/constants"
 import getConstant from "../lib/constants";
 import stream from "got";
 import unzip from "unzip-stream";
+import validateClient from "../lib/validateClient";
 
 const weclomeASCII = getConstant("welcomeMessage")
 console.log(weclomeASCII) 
@@ -33,6 +34,7 @@ inquirer
 
   ])
   .then((answers) => {
+    validateClient()
     mkdir(answers.location, (e) => {
       if (e && e.code != "EEXIST") {
         logger.error("Failed to create project directory.")

packages/cli/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "tsconfig/default",
+    "extends": "tsconfig/default.json",
     "compilerOptions": {
         "outDir": "dist"
     }

packages/framework/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "tsconfig/default.json"
+}

packages/framework/typescript/package.json

@@ -7,8 +7,8 @@
 	"private": true,
 	"scripts": {
 		"build": "tsc",
-		"dev": "ts-node-dev src/index.ts",
-		"start": "ts-node src/index.ts"
+		"dev": "ts-node-dev ./src/index.ts",
+		"start": "ts-node ./src/index.ts"
 	},
 	"dependencies": {
 		"dotenv": "^16.0.3",
@@ -21,7 +21,6 @@
 		"ts-node": "^10.9.1",
 		"eslint-config-custom": "workspace:*",
 		"eslint": "7.32.0",
-		"tsconfig": "workspace:*",
 		"ts-node-dev": "^2.0.0",
 		"tslib": "^2.4.1",
 		"typescript": "4.8.4"

packages/framework/typescript/tsconfig.json

@@ -0,0 +1,11 @@
+{
+    "extends": "../tsconfig.json",
+    "include": [
+        "**/*.ts",
+        "environment.d.ts",
+    ],
+    "exclude": [
+        "node_modules",
+        "**/*.spec.ts"
+    ]
+}

pnpm-workspace.yaml

@@ -1,3 +1,3 @@
 packages:
-  - "libs/*"
-  - "packages/*"
+  - "common/*/"
+  - "packages/*/*/"