feat: working wasm mock

jayu · jayu · commit 4ad5a14a4a55 · 2021-12-27T00:18:44.000+01:00
diff --git a/README.md b/README.md
@@ -48,16 +48,23 @@ Names:
 ✅ Bundle/minify/obfuscate
 
 ❌ Invent / Implement license mechanism
-   - try webassembly
+   - ✅ try webassembly
+   - ❌ Cleanup rust code
+   - ❌ cleanup rust deps
+   - ❌ cleanup build chunks
+   - ❌ add wasm files to package script
+   - ❌ obfuscate wasm identifiers
+   - 
 
-❌❌ Add support for proposal syntaxes
+❌ PoC / Implement vscode extension - mostly to understand how to license
+
+✅ Add support for proposal syntaxes
 
 ✅ Add support for multiple wildcards
   - `($$, $$) => {}` is invalid while parsing function
   - `$_refN` - currently without ref analysis
   - `$$_refN` - currently without ref analysis
 
-❌ PoC / Implement vscode extension - mostly to understand how to license
 
 ✅ Implement tests
 
diff --git a/__tests__/search/codePatterns.test.ts b/__tests__/search/codePatterns.test.ts
@@ -2,7 +2,7 @@ import { search } from '/search'
 import { compareCode } from '/astUtils';
 import path from 'path'
 import { getFilesList } from '/getFilesList'
-
+import { init } from '/wasm'
 const filesList = getFilesList(path.resolve(__dirname, '__fixtures__'))
 
 describe('code patterns', () => {
diff --git a/jest.config.js b/jest.config.js
@@ -8,5 +8,6 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(tsConfig.compilerOptions.paths, { prefix: '<rootDir>' }),
   "testPathIgnorePatterns": [
     "__fixtures__"
-  ]
+  ],
+  setupFilesAfterEnv: ['./jest.setup.js']
 };
diff --git a/jest.setup.js b/jest.setup.js
@@ -0,0 +1,5 @@
+const { init } = require('/wasm')
+
+beforeAll(async () => {
+  await init()
+})
diff --git a/package.json b/package.json
@@ -54,4 +54,4 @@
     "test": "yarn build && jest --passWithNoTests",
     "test:setup": "node ./dist/getFixtures.js"
   }
-}
+}
diff --git a/src/astUtils.ts b/src/astUtils.ts
@@ -1,6 +1,6 @@
 import { parse, ParserOptions } from '@babel/parser'
 // import omit from 'object.omit';
-
+import { wasmFns } from './wasm'
 export type Position = {
   line: number, column: number
 }
@@ -55,8 +55,9 @@ export const getKeysToCompare = (node: PoorNodeType) => {
 }
 
 export const sanitizeJSXText = (node: PoorNodeType) => {
+  wasmFns.transform_value(node);
   //@ts-ignore
-  node.value = node.value?.trim()
+  // node.value = node.value?.trim()
   //@ts-ignore
   node.extra.raw = node.extra.raw?.trim()
   //@ts-ignore
diff --git a/src/dev.ts b/src/dev.ts
@@ -2,19 +2,23 @@ import path from 'path';
 import fs from 'fs';
 import { search } from './search';
 import { Mode, getMode, logMetrics, print } from './utils'
+import { init } from './wasm'
 
 
 const query = fs.readFileSync(path.resolve('./devQuery')).toString()
 
-const mockFilePath = path.resolve('./devFile')
+const mockFilePath = path.resolve('./devFile');
 
-const matches = search({
-  queryCodes: [query],
-  filePaths: [mockFilePath],
-  mode: getMode(process.argv[2] as Mode),
-  caseInsensitive: Boolean(process.argv[3]),
-  debug: true,
-})
+(async () => {
+  await init()
+  const matches = search({
+    queryCodes: [query],
+    filePaths: [mockFilePath],
+    mode: getMode(process.argv[2] as Mode),
+    caseInsensitive: Boolean(process.argv[3]),
+    debug: true,
+  })
 
-print(matches)
-logMetrics()
+  print(matches)
+  logMetrics()
+})()
diff --git a/src/searchWorker.ts b/src/searchWorker.ts
@@ -1,7 +1,11 @@
 import {
   Worker, isMainThread, parentPort, workerData
 } from 'worker_threads'
+import { init } from './wasm'
 
 import { search } from './search';
 
-parentPort?.postMessage(search(workerData));
+(async () => {
+  await init()
+  parentPort?.postMessage(search(workerData));
+})()
diff --git a/src/wasm.ts b/src/wasm.ts
@@ -0,0 +1,15 @@
+type WasmType = typeof import('../crate/pkg')
+
+const notInitialized = () => {
+  throw new Error('Wasm modules not initialized')
+}
+
+export const wasmFns = {
+  transform_value: notInitialized
+} as Pick<WasmType, 'transform_value'>
+
+export const init = () => {
+  return import("../crate/pkg").then(mod => {
+    wasmFns.transform_value = mod.transform_value
+  })
+}

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@`
`54`	`54`	`"test": "yarn build && jest --passWithNoTests",`
`55`	`55`	`"test:setup": "node ./dist/getFixtures.js"`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`