feat: typescript support (#185)

* feat: initial typescript support

* feat: typescript support

* feat(plugin-helper): move files to typescript

* chore: update lock files

* feat: preset types

* fix: build

* fix: benchmark

* fix: remove pnpm cache

* fix: bench action

* fix: pnpm recursive install

* fix: nx cache

* fix: lock file

* fix: workflows

* fix: lerna support in pnpm

* fix: pnpm workspace

* fix: remove unused files

* fix: pnpm lock file

* fix: update lerna for support pnpm

* fix: lerna bootstrap

* fix: rollup build

* fix: update nx

* fix: build

* fix: add nx dep target

* fix: remove nx cache

* fix: workflow run on push only for master

* fix: test workflow run on push only for master

* fix: remove parallel for gen types

* fix: benchmark

* fix: benchmark imports

* fix: pnpm

* fix: types errors and pnpm

* fix: types

* fix: types

* refactor: parser

* fix(parser): tests

* fix: preset tests

* fix: react types

* fix: react type declarations

* fix: pnpm lock file

* fix: react preset types

* fix: lock file

* fix: vue2 types

* feat: dev container support

* fix: types

* fix: types

* refactor: rewrite pkg-task, add nx gen-types deps, fix react/render.ts

* refactor: types

* fix: types

* fix: rename gen-types to types

* fix: nx build order

* fix: nx reset

* fix: define nx deps explicit

* fix: build

* fix: nx

* fix: nx order build

* fix: nx deps

* fix: bbob cli tests

* fix: tests

* fix: cli tests and import

* fix: test cover

* fix: cli cover

.changeset/khaki-cobras-hide.md

@@ -0,0 +1,5 @@
+---
+"feat: typescript support": minor
+---
+
+Now BBob supports Typescript with typings

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "Node.js & TypeScript",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/workflows/test.yml

@@ -32,16 +32,16 @@ jobs:
           cache: 'pnpm'
 
       - name: Install
-        run: pnpm install --frozen-lockfile --strict-peer-dependencies
+        run: pnpm i --frozen-lockfile --strict-peer-dependencies
 
       - name: Run the lint
-        run: pnpm lint
+        run: pnpm run lint
 
       - name: Install coverage
         run: pnpm install --global codecov
 
       - name: Run the coverage
-        run: pnpm cover
+        run: pnpm run cover
 
       - name: Run the coverage
         run: codecov

.gitignore

@@ -64,3 +64,8 @@ typings/
 # benchmark test files
 benchmark/html5
 .nx
+
+.nx
+
+
+.nx/cache

.npmrc

@@ -1 +1,2 @@
 registry=https://registry.npmjs.org/
+link-workspace-packages=true

.swcrc-commonjs.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/swcrc",
   "module": {
     "type": "commonjs",
 
@@ -9,14 +10,12 @@
   },
   "jsc": {
     "transform": {
-      "optimizer": {
-        "simplify": false
-      }
+      "optimizer": {}
     },
     "loose": true,
     "parser": {
-      "syntax": "ecmascript",
-      "jsx": true
+      "syntax": "typescript",
+      "tsx": true
     }
   }
 }

.swcrc.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/swcrc",
   "module": {
     "type": "es6",
     "strict": false,
@@ -9,15 +10,13 @@
   "minify": false,
   "jsc": {
     "transform": {
-      "optimizer": {
-        "simplify": false
-      }
+      "optimizer": {}
     },
     "target": "es2018",
     "loose": true,
     "parser": {
-      "syntax": "ecmascript",
-      "jsx": true
+      "syntax": "typescript",
+      "tsx": true
     },
     "externalHelpers": false
   }

benchmark/index.js

@@ -48,17 +48,17 @@ suite
     });
   })
   .add('@bbob/parser lexer old', () => {
-    const lexer1 = require('@bbob/parser/lib/lexer_old');
+    const lexer1 = require('./lexer_old');
 
-    return require('@bbob/parser/lib/index').parse(stub, {
+    return require('@bbob/parser').parse(stub, {
       onlyAllowTags: ['ch'],
       createTokenizer: lexer1.createLexer,
     });
   })
   .add('@bbob/parser lexer', () => {
-    const lexer2 = require('@bbob/parser/lib/lexer');
+    const lexer2 = require('@bbob/parser');
 
-    return require('@bbob/parser/lib/index').parse(stub, {
+    return require('@bbob/parser').parse(stub, {
       onlyAllowTags: ['ch'],
       createTokenizer: lexer2.createLexer,
     });

packages/bbob-parser/src/lexer_old.js → benchmark/lexer_old.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-plusplus,no-param-reassign */
-import {
+const {
   OPEN_BRAKET,
   CLOSE_BRAKET,
   QUOTEMARK,
@@ -9,12 +9,12 @@ import {
   TAB,
   EQ,
   N,
-} from '@bbob/plugin-helper';
+} = require('@bbob/plugin-helper');
 
-import {
+const {
   Token, TYPE_ATTR_NAME, TYPE_ATTR_VALUE, TYPE_NEW_LINE, TYPE_SPACE, TYPE_TAG, TYPE_WORD,
-} from './Token';
-import { createCharGrabber, trimChar, unquote } from './utils';
+} = require('@bbob/parser/Token');
+const { createCharGrabber, trimChar, unquote } = require('@bbob/parser/utils');
 
 // for cases <!-- -->
 const EM = '!';
@@ -238,5 +238,4 @@ function createLexer(buffer, options = {}) {
   };
 }
 
-export const createTokenOfType = createToken;
-export { createLexer };
+module.exports.createLexer = createLexer;

benchmark/package.json

@@ -13,7 +13,8 @@
     "url": "https://artkost.ru/"
   },
   "dependencies": {
-    "@bbob/parser": "workspace:*",
+    "@bbob/parser": "*",
+    "@bbob/plugin-helper": "*",
     "benchmark": "2.1.4",
     "picocolors": "1.0.0",
     "xbbcode-parser": "0.1.2",

lerna.json

@@ -27,5 +27,7 @@
       "message": "chore(release): publish %s"
     }
   },
-  "useNx": true
+  "npmClient": "pnpm",
+  "useNx": true,
+  "useWorkspaces": true
 }

nx.json

@@ -1,12 +1,81 @@
 {
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
+  "targetDefaults": {
+    "types": {
+      "dependsOn": [
+        "^types"
+      ],
+      "outputs": ["{projectRoot}/types"],
+      "cache": true
+    },
+    "build": {
+      "dependsOn": [
+        "^types",
+        "^build:commonjs",
+        "^build:es",
+        "^build:umd"
+      ],
+      "outputs": ["{projectRoot}/lib", "{projectRoot}/es", "{projectRoot}/dist"],
+      "cache": true
+    },
+    "test": {
+      "dependsOn": [
+        "^build",
+        "^test"
+      ]
+    },
+    "cover": {
+      "dependsOn": [
+        "^build",
+        "^cover"
+      ],
+      "outputs": ["{projectRoot}/coverage"]
+    },
+    "lint": {
+      "dependsOn": [
+        "^lint"
+      ]
+    },
+    "build:commonjs": {
+      "dependsOn": [
+        "^build:es",
+        "^build:commonjs"
+      ],
+      "outputs": ["{projectRoot}/lib"],
+      "cache": true
+    },
+    "build:es": {
+      "dependsOn": [
+        "^build:es"
+      ],
+      "outputs": ["{projectRoot}/es"],
+      "cache": true
+    },
+    "build:umd": {
+      "dependsOn": [
+        "^build:es",
+        "^build:umd"
+      ],
+      "outputs": ["{projectRoot}/dist"],
+      "cache": true
+    }
+  },
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
+  "defaultBase": "master",
+  "extends": "nx/presets/npm.json",
+  "plugins": [
+    {
+      "plugin": "@nx/eslint/plugin",
       "options": {
-        "cacheableOperations": ["build"]
+        "targetName": "eslint:lint",
+        "extensions": [
+          "ts",
+          "tsx",
+          "js",
+          "jsx",
+          "html",
+          "vue"
+        ]
       }
     }
-  },
-  "targetDefaults": {},
-  "defaultBase": "master"
+  ]
 }

package.json

@@ -1,7 +1,8 @@
 {
+  "name": "bbob",
   "scripts": {
     "prepublishOnly": "npm run test",
-    "bootstrap": "lerna bootstrap --no-ci",
+    "bootstrap": "pnpm re",
     "publish-ci": "npm run build && lerna publish from-package --yes --include-merged-tags --conventional-commits",
     "publish-canary": "npm run build && lerna publish --yes --include-merged-tags --conventional-commits --no-private --no-git-tag-version",
     "publish-from-packages": "npm run build && lerna publish from-package --yes --include-merged-tags --conventional-commits --create-release github",
@@ -10,11 +11,13 @@
     "publish-minor": "npm run build && lerna version minor --include-merged-tags --conventional-commits --no-git-tag-version --no-private",
     "size": "nx run-many --target=size",
     "bundlesize": "nx run-many --target=bundlesize",
-    "test": "npm run build && nx run-many --target=link && nx run-many --target=test",
+    "test": "nx run-many --target=test",
     "cover": "nx run-many --target=cover",
     "build": "nx run-many --target=build",
+    "types": "nx run-many --target=types",
     "release": "npm run build && changeset publish",
-    "lint": "nx run-many --target=link && npm run build && nx run-many --target=lint"
+    "lint": "nx run-many --target=lint",
+    "cleanup": "node scripts/cleanup"
   },
   "author": {
     "name": "Nikolay Kostyurin <[email protected]>",
@@ -26,14 +29,13 @@
     "@changesets/cli": "2.26.2",
     "@commitlint/cli": "13.2.1",
     "@commitlint/config-conventional": "13.2.0",
-    "@nrwl/cli": "15.3.3",
-    "@rollup/plugin-commonjs": "23.0.2",
-    "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup/plugin-replace": "5.0.1",
-    "@size-limit/preset-small-lib": "6.0.1",
-    "@swc/cli": "0.1.57",
-    "@swc/core": "1.3.16",
-    "@swc/jest": "0.2.23",
+    "@rollup/plugin-commonjs": "25.0.7",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-replace": "5.0.5",
+    "@size-limit/preset-small-lib": "11.0.1",
+    "@swc/cli": "0.3.10",
+    "@swc/core": "1.3.107",
+    "@swc/jest": "0.2.36",
     "@testing-library/dom": "9.3.1",
     "@testing-library/jest-dom": "6.1.2",
     "bundlesize2": "0.0.31",
@@ -46,18 +48,26 @@
     "eslint-plugin-react": "7.26.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "husky": "7.0.2",
-    "jest": "29.5.0",
-    "jest-environment-jsdom": "29.6.4",
-    "lerna": "6.0.3",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "lerna": "7.4.1",
     "lint-staged": "11.2.3",
     "microtime": "3.0.0",
-    "nx": "15.3.3",
-    "posthtml-render": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "rollup": "3.3.0",
+    "nx": "18.3.3",
+    "posthtml-render": "3.0.0",
+    "rimraf": "5.0.5",
+    "rollup": "4.1.5",
     "rollup-plugin-gzip": "3.1.0",
-    "rollup-plugin-swc3": "0.7.0",
-    "size-limit": "6.0.1"
+    "rollup-plugin-swc3": "0.11.0",
+    "size-limit": "11.0.1",
+    "typescript": "5.1.6",
+    "@types/node": "20.4.5",
+    "@types/jest": "29.5.3",
+    "@types/react": "18.2.18",
+    "@nx/eslint": "18.3.3",
+    "@nx/rollup": "18.3.3",
+    "@nx/jest": "18.3.3",
+    "@bbob/scripts": "*"
   },
   "publishConfig": {
     "access": "public",
@@ -69,15 +79,18 @@
     }
   },
   "pkgTasks": {
-    "build-commonjs": "@/cross-env BABEL_ENV=commonjs NODE_ENV=production @/swc --config-file ../../.swcrc-commonjs.json --out-dir lib src",
-    "build-es": "@/cross-env BABEL_ENV=es NODE_ENV=production @/swc --config-file ../../.swcrc.json --out-dir es src",
-    "build-umd": "@/cross-env BABEL_ENV=rollup NODE_ENV=production @/rollup --config ../../rollup.config.mjs",
+    "build:commonjs": "@/cross-env BABEL_ENV=commonjs NODE_ENV=production @/swc ./src/ --config-file ../../.swcrc-commonjs.json --out-dir lib --strip-leading-paths",
+    "build:es": "@/cross-env BABEL_ENV=es NODE_ENV=production @/swc ./src/ --config-file ../../.swcrc.json --out-dir es --strip-leading-paths",
+    "build:umd": "@/cross-env BABEL_ENV=rollup NODE_ENV=production @/rollup --config ../../rollup.config.mjs",
+    "build": "npm run build:es && npm run build:commonjs && npm run build:umd",
     "test": "@/jest",
-    "cover": "@/jest --config ../../jest.config.js --coverage .",
+    "cover": "@/jest --coverage .",
     "lint": "@/eslint .",
-    "bundlesize": "npm run build && @/cross-env NODE_ENV=production @/bundlesize ."
+    "types": "@/tsc",
+    "bundlesize": "npm run build && @/cross-env NODE_ENV=production @/bundlesize .",
+    "size": "npm run build && @/cross-env NODE_ENV=production @/size-limit ."
   },
-  "packageManager": "pnpm@8.7.6",
+  "packageManager": "pnpm@8.15.1",
   "pnpm": {
     "overrides": {
       "semver@>=7.0.0 <7.5.2": ">=7.5.2",
@@ -100,5 +113,8 @@
         }
       }
     }
+  },
+  "nx": {
+    "includedScripts": []
   }
 }

packages/bbob-cli/.gitignore

@@ -1,2 +1,7 @@
 coverage
 dist
+lib
+es
+types
+test/*.d.ts
+test/*.map