feat: add YAML WASM support

apidom/.gitignore

@@ -1,5 +1,4 @@
 node_modules/
 /lerna-debug.log
-/tree-sitter-json.wasm
 .idea/
 *.iml

apidom/package.json

@@ -9,12 +9,12 @@
   },
   "comments": {
     "scripts": {
-      "prebuild": "We build WASM here once and copy into specific packages to avoid multiple WASM build"
+      "prebuild": "We build WASM directly inside node_modules"
     }
   },
   "scripts": {
     "postinstall": "npm run link-parent-bin",
-    "prebuild": "tree-sitter build-wasm ./node_modules/tree-sitter-json && copyfiles tree-sitter-json.wasm packages/apidom-parser-adapter-asyncapi2-0-json && copyfiles tree-sitter-json.wasm packages/apidom-parser-adapter-openapi3-1-json",
+    "prebuild": "cd ./node_modules/tree-sitter-json && tree-sitter generate ./grammar.js && tree-sitter build-wasm && cd ../tree-sitter-yaml && cross-env BABEL_ENV=commonjs NODE_OPTIONS='-r core-js/stable @babel/register' tree-sitter generate ./grammar.js && tree-sitter build-wasm",
     "build": "lerna run build",
     "lint": "lerna run lint",
     "lint:fix": "lerna run lint",
@@ -76,7 +76,7 @@
     "regenerator-runtime": "=0.13.5",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "=3.0.2",
-    "tree-sitter-cli": "=0.16.9",
+    "tree-sitter-cli": "=0.17.0",
     "typescript": "=3.9.3",
     "webpack": "=4.43.0",
     "webpack-cli": "=3.3.11"
@@ -88,6 +88,7 @@
     "apidom-ns-openapi3-1": "file:packages/apidom-ns-openapi3-1",
     "apidom-parser": "file:packages/apidom-parser",
     "apidom-parser-adapter-asyncapi2-0-json": "file:packages/apidom-parser-adapter-asyncapi2-0-json",
-    "apidom-parser-adapter-openapi3-1-json": "file:packages/apidom-parser-adapter-openapi3-1-json"
+    "apidom-parser-adapter-openapi3-1-json": "file:packages/apidom-parser-adapter-openapi3-1-json",
+    "apidom-parser-adapter-openapi3-1-yaml": "file:packages/apidom-parser-adapter-openapi3-1-yaml"
   }
 }

apidom/packages/apidom-parser-adapter-asyncapi2-0-json/.gitignore

@@ -2,4 +2,3 @@
 /es
 /lib
 /types
-/tree-sitter-json.wasm

apidom/packages/apidom-parser-adapter-asyncapi2-0-json/package.json

@@ -12,7 +12,7 @@
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es --extensions '.ts' --root-mode 'upward'",
     "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib --extensions '.ts' --root-mode 'upward'",
     "build:umd:browser": "npm run build:wasm && cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
-    "build:wasm": "node ./scripts/file-exists.js tree-sitter-json.wasm && exit 0 || tree-sitter build-wasm ../../node_modules/tree-sitter-json",
+    "build:wasm": "node ../../scripts/file-exists.js ../../node_modules/tree-sitter-json/tree-sitter-json.wasm && exit 0 || cd ../../node_modules/tree-sitter-json && tree-sitter generate ./grammar.js && tree-sitter build-wasm",
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
     "clean": "rimraf ./es ./lib ./dist tree-sitter-json.wasm",
@@ -31,11 +31,11 @@
     "ramda": "=0.27.0",
     "ramda-adjunct": "=2.27.0",
     "stampit": "=4.3.1",
-    "tree-sitter": "=0.16.2",
+    "tree-sitter": "=0.17.0",
     "tree-sitter-json": "=0.16.0",
-    "web-tree-sitter": "=0.16.4"
+    "web-tree-sitter": "=0.17.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "=0.16.9"
+    "tree-sitter-cli": "=0.17.0"
   }
 }

apidom/packages/apidom-parser-adapter-asyncapi2-0-json/src/parser/index-browser.ts

@@ -2,10 +2,10 @@ import './index-browser-patch';
 
 import Parser from 'web-tree-sitter';
 import * as apiDOM from 'apidom';
+// @ts-ignore
+import treeSitterJson from 'tree-sitter-json/tree-sitter-json.wasm';
 
 import parse from '.';
-// @ts-ignore
-import treeSitterJson from '../../tree-sitter-json.wasm';
 
 export { namespace } from './index';
 

apidom/packages/apidom-parser-adapter-openapi3-1-json/.gitignore

@@ -2,4 +2,3 @@
 /es
 /lib
 /types
-/tree-sitter-json.wasm

apidom/packages/apidom-parser-adapter-openapi3-1-json/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apidom-parser-adapter-openapi3-1-json",
   "version": "0.1.0",
-  "description": "OpenAPI 3.1 adapter for ApiDOM parser",
+  "description": "OpenAPI 3.1 JSON adapter for ApiDOM parser",
   "main": "lib/adapter-node.js",
   "module": "es/adapter-browser.js",
   "jsnext:main": "es/adapter-browser.js",
@@ -12,7 +12,7 @@
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es --extensions '.ts' --root-mode 'upward'",
     "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib --extensions '.ts' --root-mode 'upward'",
     "build:umd:browser": "npm run build:wasm && cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
-    "build:wasm": "node ./scripts/file-exists.js tree-sitter-json.wasm && exit 0 || tree-sitter build-wasm ../../node_modules/tree-sitter-json",
+    "build:wasm": "node ../../scripts/file-exists.js ../../node_modules/tree-sitter-json/tree-sitter-json.wasm && exit 0 || cd ../../node_modules/tree-sitter-json && tree-sitter generate ./grammar.js && tree-sitter build-wasm",
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
     "clean": "rimraf ./es ./lib ./dist tree-sitter-json.wasm",
@@ -31,11 +31,11 @@
     "ramda": "=0.27.0",
     "ramda-adjunct": "=2.27.0",
     "stampit": "=4.3.1",
-    "tree-sitter": "=0.16.2",
+    "tree-sitter": "=0.17.0",
     "tree-sitter-json": "=0.16.0",
-    "web-tree-sitter": "=0.16.4"
+    "web-tree-sitter": "=0.17.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "=0.16.9"
+    "tree-sitter-cli": "=0.17.0"
   }
 }

apidom/packages/apidom-parser-adapter-openapi3-1-json/src/adapter.ts

@@ -1,7 +1,6 @@
 export const mediaTypes = [
   'application/vnd.oai.openapi;version=3.1.0',
   'application/vnd.oai.openapi+json;version=3.1.0',
-  'application/vnd.oai.openapi+yaml;version=3.1.0',
 ];
 
 export const detect = (source: string): boolean =>

apidom/packages/apidom-parser-adapter-openapi3-1-json/src/parser/index-browser.ts

@@ -2,10 +2,10 @@ import './index-browser-patch';
 
 import Parser from 'web-tree-sitter';
 import * as apiDOM from 'apidom';
+// @ts-ignore
+import treeSitterJson from 'tree-sitter-json/tree-sitter-json.wasm';
 
 import parse from '.';
-// @ts-ignore
-import treeSitterJson from '../../tree-sitter-json.wasm';
 
 export { namespace } from './index';
 

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/.eslintignore

@@ -0,0 +1,8 @@
+/dist
+/es
+/lib
+/types
+/config
+/.nyc_output
+/node_modules
+/**/*.js

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/.gitignore

@@ -0,0 +1,4 @@
+/dist
+/es
+/lib
+/types

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/.mocharc.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  recursive: true,
+  spec: 'test/**/*.ts',
+  require: ['test/mocha-bootstrap.js'],
+};

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/.npmrc

@@ -0,0 +1,2 @@
+save-prefix="="
+save=false

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/config/webpack/browser.config.js

@@ -0,0 +1,88 @@
+'use strict';
+
+const path = require('path');
+const { nonMinimizeTrait, minimizeTrait } = require('./traits.config');
+
+const browser = {
+  mode: 'production',
+  entry: ['./src/polyfills.ts', './src/adapter-browser.ts'],
+  target: 'web',
+  node: {
+    fs: 'empty',
+  },
+  performance: {
+    maxEntrypointSize: 712000,
+    maxAssetSize: 712000,
+  },
+  output: {
+    path: path.resolve('./dist'),
+    filename: 'apidom-parser-adapter-openapi3-1-yaml.browser.js',
+    libraryTarget: 'umd',
+    library: 'apidomParserAdapterOpenApi3_1Yaml',
+  },
+  resolve: {
+    extensions: ['.ts', '.mjs', '.js', '.json'],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.wasm$/,
+        loader: 'file-loader',
+        type: 'javascript/auto',
+      },
+      {
+        test: /\.(ts|js)?$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            babelrc: true,
+            rootMode: 'upward',
+          },
+        },
+      },
+    ],
+  },
+  ...nonMinimizeTrait,
+};
+
+const browserMin = {
+  mode: 'production',
+  entry: ['./src/polyfills.ts', './src/adapter-browser.ts'],
+  target: 'web',
+  node: {
+    fs: 'empty',
+  },
+  output: {
+    path: path.resolve('./dist'),
+    filename: 'apidom-parser-adapter-openapi3-1-yaml.browser.min.js',
+    libraryTarget: 'umd',
+    library: 'apidomParserAdapterOpenApi3_1Yaml',
+  },
+  resolve: {
+    extensions: ['.ts', '.mjs', '.js', '.json'],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.wasm$/,
+        loader: 'file-loader',
+        type: 'javascript/auto',
+      },
+      {
+        test: /\.(ts|js)?$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            babelrc: true,
+            rootMode: 'upward',
+          },
+        },
+      },
+    ],
+  },
+  ...minimizeTrait,
+};
+
+module.exports = [browser, browserMin];

apidom/packages/apidom-parser-adapter-openapi3-1-yaml/config/webpack/traits.config.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const webpack = require('webpack');
+const TerserPlugin = require('terser-webpack-plugin');
+
+const nonMinimizeTrait = {
+  optimization: {
+    minimize: false,
+    usedExports: false,
+    concatenateModules: false,
+  },
+};
+
+const minimizeTrait = {
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      minimize: true,
+    }),
+  ],
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        terserOptions: {
+          compress: {
+            warnings: false,
+          },
+          output: {
+            comments: false,
+          },
+        },
+      }),
+    ],
+  },
+};
+
+module.exports = {
+  nonMinimizeTrait,
+  minimizeTrait,
+};