fix: attempt to fix the runner serialization thing again

Author: brianleroux

package.json

@@ -11,7 +11,7 @@
     "test:nolint": "npm run test:integration && npm run coverage",
     "test:unit": "AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node --test --test-reporter=spec 'test/unit/**/*-test.js'",
     "test:slow": "node --test --test-reporter=spec 'test/slow/**/*-test.js'",
-    "test:integration": "AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node test/integration/static/index-test.js && AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node --test --test-reporter=spec 'test/integration/static/publish/*-test.js' 'test/integration/macros-n-plugins-test.js'",
+    "test:integration": "AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node test/integration/static/index-test.js && AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node test/integration/static/publish/index-test.js && AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node --test --test-reporter=spec 'test/integration/macros-n-plugins-test.js'",
     "coverage": "mkdir -p coverage && AWS_ACCESS_KEY_ID=\"blah\" AWS_SECRET_ACCESS_KEY=\"blah\" node --test --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=coverage/lcov.info 'test/unit/**/*-test.js'",
     "lint": "eslint . --fix",
     "rc": "npm version prerelease --preid RC"

test/integration/static/publish/index-test.js

@@ -1,13 +1,20 @@
-const { test } = require('node:test')
-const assert = require('node:assert/strict')
+#!/usr/bin/env node
+// Custom test runner to avoid Node.js test runner serialization issues
 const awsLite = require('@aws-lite/client')
 const { join, dirname } = require('path')
 const { mkdtempSync, mkdirSync, writeFileSync, rmSync } = require('fs')
 const { tmpdir } = require('os')
 const _inventory = require('@architect/inventory')
 const { updater } = require('@architect/utils')
 
+let passed = 0
+let failed = 0
 let tmpDir
+let inventory
+let params
+let putted
+let deleted
+let aws
 
 function createTmpDir (structure) {
   const dir = mkdtempSync(join(tmpdir(), 'arc-test-'))
@@ -20,7 +27,6 @@ function createTmpDir (structure) {
         createStructure(path, value)
       }
       else {
-        // Ensure parent directory exists for files
         const parentDir = dirname(path)
         mkdirSync(parentDir, { recursive: true })
         writeFileSync(path, value || '')
@@ -32,15 +38,11 @@ function createTmpDir (structure) {
   return dir
 }
 
-let inventory
-let params
-let putted
-let deleted
-
 function putFiles (params, callback) {
   putted = params
   callback(null, params.files.length, 0)
 }
+
 function deleteFiles (params, callback) {
   deleted = params
   callback()
@@ -50,18 +52,20 @@ function deleteFiles (params, callback) {
 const Module = require('module')
 const originalLoad = Module._load
 Module._load = function (request, parent) {
-  if (request === './s3/put-files' && parent.filename.includes('src/static/publish/index.js')) {
+  if (request === './s3/put-files' && parent.filename && parent.filename.includes('src/static/publish/index.js')) {
     return putFiles
   }
-  if (request === './s3/delete-files' && parent.filename.includes('src/static/publish/index.js')) {
+  if (request === './s3/delete-files' && parent.filename && parent.filename.includes('src/static/publish/index.js')) {
     return deleteFiles
   }
   return originalLoad.apply(this, arguments)
 }
 
 const sut = require(join(process.cwd(), 'src', 'static', 'publish', 'index.js'))
 
-let aws
+// Restore immediately after loading
+Module._load = originalLoad
+
 let defaultParams = () => ({
   aws,
   Bucket: 'a-bucket',
@@ -85,85 +89,138 @@ function setup () {
   awsLite.testing.mock('S3.DeleteObjects', '')
 }
 
-test('Set up env', async () => {
-  assert.ok(sut, 'S3 publish module is present')
-
-  aws = await awsLite({ region: 'us-west-2', plugins: [ import('@aws-lite/s3') ] })
-  awsLite.testing.enable()
-  assert.ok(awsLite.testing.isEnabled(), 'AWS client testing enabled')
+async function test (name, fn) {
+  try {
+    await fn()
+    console.log(`✔ ${name}`)
+    passed++
+  }
+  catch (err) {
+    console.error(`✖ ${name}`)
+    console.error(err)
+    failed++
+  }
+}
 
-  tmpDir = createTmpDir({
-    'app.arc': arc,
-    public: {
-      'index.html':     content,
-      'something.json': content,
-      'index.js':       content,
-    },
+async function main () {
+  await test('Set up env', async () => {
+    if (!sut) throw new Error('S3 publish module is not present')
+
+    aws = await awsLite({ region: 'us-west-2', plugins: [ import('@aws-lite/s3') ] })
+    awsLite.testing.enable()
+    if (!awsLite.testing.isEnabled()) throw new Error('AWS client testing not enabled')
+
+    tmpDir = createTmpDir({
+      'app.arc': arc,
+      public: {
+        'index.html':     content,
+        'something.json': content,
+        'index.js':       content,
+      },
+    })
+    inventory = await _inventory({ cwd: tmpDir })
+    if (!inventory) throw new Error('Failed to get inventory obj')
   })
-  inventory = await _inventory({ cwd: tmpDir })
-  assert.ok(inventory, 'Got inventory obj')
-})
 
-test('Static asset publishing', (t, done) => {
-  setup()
-  sut(params, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(putted.files.length, 3, 'Passed files to be published')
-    assert.strictEqual(putted.fingerprint, null, 'Passed fingerprint unmutated')
-    assert.ok(putted.publicDir, 'Passed publicDir')
-    assert.strictEqual(putted.prefix, undefined, 'Passed prefix unmutated')
-    assert.strictEqual(putted.region, params.region, 'Passed region unmutated')
-    assert.deepStrictEqual(putted.staticManifest, {}, 'Passed empty staticManifest by default')
-    assert.ok(!deleted, 'No files pruned')
-    done()
+  await test('Static asset publishing', async () => {
+    setup()
+    await new Promise((resolve, reject) => {
+      sut(params, err => {
+        if (err) reject(err)
+        else {
+          try {
+            if (putted.files.length !== 3) throw new Error('Expected 3 files to be published')
+            if (putted.fingerprint !== null) throw new Error('Expected fingerprint to be null')
+            if (!putted.publicDir) throw new Error('Expected publicDir to be set')
+            if (putted.prefix !== undefined) throw new Error('Expected prefix to be undefined')
+            if (putted.region !== params.region) throw new Error('Expected region to match')
+            if (JSON.stringify(putted.staticManifest) !== '{}') throw new Error('Expected empty staticManifest')
+            if (deleted) throw new Error('Expected no files to be pruned')
+            resolve()
+          }
+          catch (err) {
+            reject(err)
+          }
+        }
+      })
+    })
   })
-})
 
-test(`Static asset deletion (deployAction is 'all')`, (t, done) => {
-  setup()
-  let params = defaultParams()
-  params.prune = true
-  params.deployAction = 'all'
-  sut(params, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(deleted.Bucket, params.Bucket, 'Passed bucket unmutated')
-    assert.strictEqual(deleted.files.length, 3, 'Passed files to be published')
-    assert.strictEqual(deleted.fingerprint, null, 'Passed fingerprint unmutated')
-    assert.strictEqual(deleted.folder, params.folder, 'Passed folder unmutated')
-    assert.strictEqual(deleted.prefix, undefined, 'Passed prefix unmutated')
-    assert.strictEqual(deleted.region, params.region, 'Passed region setting unmutated')
-    assert.deepStrictEqual(deleted.staticManifest, {}, 'Passed empty staticManifest by default')
-    done()
+  await test('Static asset deletion (deployAction is all)', async () => {
+    setup()
+    let testParams = defaultParams()
+    testParams.prune = true
+    testParams.deployAction = 'all'
+    await new Promise((resolve, reject) => {
+      sut(testParams, err => {
+        if (err) reject(err)
+        else {
+          try {
+            if (deleted.Bucket !== testParams.Bucket) throw new Error('Expected bucket to match')
+            if (deleted.files.length !== 3) throw new Error('Expected 3 files')
+            if (deleted.fingerprint !== null) throw new Error('Expected fingerprint to be null')
+            if (deleted.folder !== testParams.folder) throw new Error('Expected folder to match')
+            if (deleted.prefix !== undefined) throw new Error('Expected prefix to be undefined')
+            if (deleted.region !== testParams.region) throw new Error('Expected region to match')
+            if (JSON.stringify(deleted.staticManifest) !== '{}') throw new Error('Expected empty staticManifest')
+            resolve()
+          }
+          catch (err) {
+            reject(err)
+          }
+        }
+      })
+    })
   })
-})
 
-test(`Static asset deletion (deployAction is 'delete')`, (t, done) => {
-  setup()
-  let params = defaultParams()
-  params.prune = true
-  params.deployAction = 'delete'
-  sut(params, err => {
-    if (err) assert.fail(err)
-    assert.strictEqual(deleted.Bucket, params.Bucket, 'Passed bucket unmutated')
-    assert.strictEqual(deleted.files.length, 3, 'Passed files to be published')
-    assert.strictEqual(deleted.fingerprint, null, 'Passed fingerprint unmutated')
-    assert.strictEqual(deleted.folder, params.folder, 'Passed folder unmutated')
-    assert.strictEqual(deleted.prefix, undefined, 'Passed prefix unmutated')
-    assert.strictEqual(deleted.region, params.region, 'Passed region setting unmutated')
-    assert.deepStrictEqual(deleted.staticManifest, {}, 'Passed empty staticManifest by default')
-    done()
+  await test('Static asset deletion (deployAction is delete)', async () => {
+    setup()
+    let testParams = defaultParams()
+    testParams.prune = true
+    testParams.deployAction = 'delete'
+    await new Promise((resolve, reject) => {
+      sut(testParams, err => {
+        if (err) reject(err)
+        else {
+          try {
+            if (deleted.Bucket !== testParams.Bucket) throw new Error('Expected bucket to match')
+            if (deleted.files.length !== 3) throw new Error('Expected 3 files')
+            if (deleted.fingerprint !== null) throw new Error('Expected fingerprint to be null')
+            if (deleted.folder !== testParams.folder) throw new Error('Expected folder to match')
+            if (deleted.prefix !== undefined) throw new Error('Expected prefix to be undefined')
+            if (deleted.region !== testParams.region) throw new Error('Expected region to match')
+            if (JSON.stringify(deleted.staticManifest) !== '{}') throw new Error('Expected empty staticManifest')
+            resolve()
+          }
+          catch (err) {
+            reject(err)
+          }
+        }
+      })
+    })
   })
-})
 
-test('Teardown', () => {
-  if (tmpDir) {
-    try {
-      rmSync(tmpDir, { recursive: true, force: true })
-    }
-    catch {
-      // Ignore cleanup errors
+  await test('Teardown', async () => {
+    if (tmpDir) {
+      try {
+        rmSync(tmpDir, { recursive: true, force: true })
+      }
+      catch {
+        // Ignore cleanup errors
+      }
     }
-  }
-  awsLite.testing.disable()
-  assert.ok(!awsLite.testing.isEnabled(), 'Done')
-})
+    awsLite.testing.disable()
+    if (awsLite.testing.isEnabled()) throw new Error('AWS testing not disabled')
+  })
+
+  console.log(`\nℹ tests ${passed + failed}`)
+  console.log(`ℹ pass ${passed}`)
+  console.log(`ℹ fail ${failed}`)
+
+  process.exit(failed > 0 ? 1 : 0)
+}
+
+// Only run if executed directly
+if (require.main === module) {
+  main()
+}