@nxtedition/lib 23.17.19 → 24.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.17.19",
+  "version": "24.0.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -70,7 +70,8 @@
     "@elastic/transport": "^8.9.3",
     "@nxtedition/nxt-undici": "^6.4.0",
     "@smithy/node-http-handler": "^4.1.1",
-    "@swc/wasm-web": "^1.13.5",
+    "acorn": "^8.15.0",
+    "astring": "^1.9.0",
     "date-fns": "^4.1.0",
     "diff": "5.2.0",
     "fast-querystring": "^1.1.2",

package/util/template/index-common.js

@@ -4,8 +4,8 @@ import getNxtpressionsCompiler from './nextpressions.js'
 import getJavascriptCompiler from './javascript.js'
 import JSON5 from 'json5'
 import objectHash from 'object-hash'
-import { makeWeakCache } from '../../weakCache.js'
 import firstValueFrom from '../../rxjs/firstValueFrom.js'
+import { LRUCache } from 'lru-cache'
 
 export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
   const compiler = {
@@ -210,20 +210,35 @@ export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  const _compileTemplateCache = makeWeakCache(
-    (template) => {
-      if (fp.isPlainObject(template)) {
-        return compileObjectTemplate(template)
-      } else if (fp.isArray(template)) {
-        return compileArrayTemplate(template)
-      } else if (isTemplate(template)) {
-        return compileStringTemplate(template)
-      } else {
-        return null
+  const objCache = new WeakMap()
+  const strCache = new LRUCache({ max: 8192 })
+
+  const _compileTemplateCache = (template) => {
+    if (fp.isPlainObject(template)) {
+      let resolver = objCache.get(template)
+      if (resolver == null) {
+        resolver = compileObjectTemplate(template)
+        objCache.set(template, resolver)
+      }
+      return resolver
+    } else if (Array.isArray(template)) {
+      let resolver = objCache.get(template)
+      if (resolver == null) {
+        resolver = compileArrayTemplate(template)
+        objCache.set(template, resolver)
       }
-    },
-    (template, hash) => hash,
-  )
+      return resolver
+    } else if (isTemplate(template)) {
+      let resolver = strCache.get(template)
+      if (resolver == null) {
+        resolver = compileStringTemplate(template)
+        strCache.set(template, resolver)
+      }
+      return resolver
+    } else {
+      return null
+    }
+  }
 
   function _compileTemplate(template) {
     const hash = hashTemplate(template)

package/util/template/index-web.d.ts

@@ -1,2 +1 @@
 export * from './index-common.d.ts'
-export function init(): Promise<void>

package/util/template/index-web.js

@@ -1,10 +1,5 @@
-import _init from '@swc/wasm-web'
 import { makeTemplateCompiler as commonMakeTemplateCompiler } from './index-common.js'
 
-export async function init() {
-  await _init()
-}
-
 export function makeTemplateCompiler({ ds, proxify, logger = console }) {
   return commonMakeTemplateCompiler({
     ds,

package/util/template/index.js

@@ -1,6 +1,3 @@
-import { createRequire } from 'node:module'
-import { readFileSync } from 'node:fs'
-import { initSync } from '@swc/wasm-web'
 import { makeTemplateCompiler as commonMakeTemplateCompiler } from './index-common.js'
 import { hashSync } from 'hasha'
 import { request } from '@nxtedition/nxt-undici'
@@ -8,12 +5,6 @@ import { doYield } from '../../yield.js'
 
 export * from './index-common.js'
 
-const require = createRequire(import.meta.url)
-const wasmPath = require.resolve('@swc/wasm-web').replace('wasm.js', 'wasm_bg.wasm')
-const wasmBuffer = readFileSync(wasmPath)
-
-initSync({ module: wasmBuffer })
-
 export function makeTemplateCompiler({
   logger = globalThis.__nxt_lib_app?.logger,
   dispatcher,

package/util/template/transform.js

@@ -1,7 +1,8 @@
-import { parseSync, printSync } from '@swc/wasm-web'
+import { parse } from 'acorn'
+import { generate } from 'astring'
 
 export default function (code) {
-  const ast = parseSync(code, { syntax: 'ecmascript', script: true })
+  const ast = parse(code, { ecmaVersion: 'latest' })
 
   const { body } = ast
 
@@ -13,10 +14,9 @@ export default function (code) {
         type: 'ReturnStatement',
         argument:
           lastStatement.type === 'ExpressionStatement' ? lastStatement.expression : lastStatement,
-        span: lastStatement.span,
       }
     }
   }
 
-  return printSync(ast).code
+  return generate(ast)
 }

package/util/template/transform.test.js

@@ -1,20 +1,11 @@
 import { test } from 'node:test'
 import assert from 'node:assert'
 import transform from './transform.js'
-import { createRequire } from 'node:module'
-import { readFileSync } from 'node:fs'
-import { initSync } from '@swc/wasm-web'
-
-const require = createRequire(import.meta.url)
-const wasmPath = require.resolve('@swc/wasm-web').replace('wasm.js', 'wasm_bg.wasm')
-const wasmBuffer = readFileSync(wasmPath)
-
-initSync({ module: wasmBuffer })
 
 test('transform', function () {
   assert.strictEqual(transform('const x = 2; x;'), 'const x = 2;\nreturn x;\n')
-  assert.strictEqual(transform('[1,2,3];'), 'return [\n    1,\n    2,\n    3\n];\n')
-  assert.strictEqual(transform('[1,2,3]'), 'return [\n    1,\n    2,\n    3\n];\n')
+  assert.strictEqual(transform('[1,2,3];'), 'return [1, 2, 3];\n')
+  assert.strictEqual(transform('[1,2,3]'), 'return [1, 2, 3];\n')
   assert.strictEqual(transform('x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)
   // assert.strictEqual(transform('return x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)
   // assert.strictEqual(transform('return\n x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)