ci: move pre-commit checks to CI

.github/workflows/ci.yml

@@ -6,7 +6,26 @@ on:
             - master
     pull_request:
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
+    LintRepo:
+        name: Lint Repo
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+            - run: |
+                yarn install
+                yarn pre-commit
+            - name: Assert no unstaged changes
+              run: git diff --exit-code
+
     Build:
         name: Build Editor
         runs-on: ubuntu-latest
@@ -16,7 +35,6 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   node-version: 16
-                  cache: 'yarn'
             - run: yarn install
             - run: yarn build-editor
               env:
@@ -34,7 +52,6 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node-version }}
-                  cache: 'yarn'
             - run: yarn install
             - run: |
                 yarn build-types # typecheck
@@ -52,6 +69,5 @@ jobs:
             - uses: actions/setup-node@v3
               with:
                   node-version: 16
-                  cache: 'yarn'
             - run: yarn install
             - run: yarn eslint src/ editor/

.github/workflows/release.yml

@@ -26,9 +26,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+            fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
           node-version: 16
       - run: npx changelogithub
         env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package.json

@@ -32,13 +32,11 @@
         "coverage": "vitest run --coverage",
         "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
         "format": "eslint src/ editor/ --fix && prettier 'editor/**/*.css' --write",
-        "schema": "ts-json-schema-generator -p src/index.ts -f tsconfig.json -t GoslingSpec --no-type-check --no-ref-encode > schema/gosling.schema.json",
-        "schema-higlass": "ts-json-schema-generator -p src/index.ts -f tsconfig.json -t HiGlassSpec --no-type-check --no-ref-encode > schema/higlass.schema.json",
-        "schema-theme": "ts-json-schema-generator -p src/index.ts -f tsconfig.json -t Theme --no-type-check --no-ref-encode > schema/theme.schema.json",
-        "schema-template": "ts-json-schema-generator -p src/index.ts -f tsconfig.json -t TemplateTrackDef --no-type-check --no-ref-encode > schema/template.schema.json",
+        "schema": "node scripts/generate-schemas.mjs",
         "schema-versioning": "mkdir -p schema/history/$npm_package_version && cp schema/gosling.schema.json schema/history/$npm_package_version/gosling$npm_package_version.schema.json && cp src/core/gosling.schema.ts schema/history/$npm_package_version/gosling$npm_package_version.schema.ts",
         "predeploy": "yarn build-editor; echo \"gosling.js.org\" >> build/CNAME",
-        "deploy": "gh-pages -d build"
+        "deploy": "gh-pages -d build",
+        "pre-commit": "run-p changelog schema format"
     },
     "peerDependencies": {
         "pixi.js": "^6.3.0",
@@ -155,7 +153,6 @@
     },
     "husky": {
         "hooks": {
-            "pre-commit": "run-p changelog schema schema-higlass schema-theme schema-template format && git add .",
             "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
         }
     }

scripts/generate-schemas.mjs

@@ -0,0 +1,34 @@
+// @ts-check
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as url from "node:url";
+import * as tsj from "ts-json-schema-generator";
+
+// Copied from `ts-json-schema-generator` to create
+// identical schemas to the one previously generated by CLI.
+// @ref: https://github.com/vega/ts-json-schema-generator/blob/aec8a25f366fa32ba9539adc5a91f4ff3b14d1e9/ts-json-schema-generator.ts#LL67C1-L68C1
+import stableStringify from "safe-stable-stringify";
+
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+
+const SCHEMAS = [
+  ["GoslingSpec", "gosling.schema.json"],
+  ["HiGlassSpec", "higlass.schema.json"],
+  ["Theme", "theme.schema.json"],
+  ["TemplateTrackDef", "template.schema.json"],
+];
+
+const generator = tsj.createGenerator({
+  path: path.resolve(__dirname, "../src/index.ts"),
+  tsconfig: path.resolve(__dirname, "../tsconfig.json"),
+  skipTypeCheck: true,
+  encodeRefs: false,
+});
+
+for (const [type, filename] of SCHEMAS) {
+  const schema = generator.createSchema(type);
+  fs.promises.writeFile(
+      path.resolve(__dirname, `../schema/${filename}`),
+      stableStringify(schema, null, 2) + "\n",
+  );
+}