@things-factory/shell 10.1.149 → 10.1.150

package/bin/things-factory

@@ -2,4 +2,4 @@
 
 'use strict'
 
-require('@things-factory/shell/dist-server/server')
+require('../dist-server/server.js')

package/bin/things-factory-dev

@@ -2,4 +2,4 @@
 
 'use strict'
 
-require('@things-factory/shell/dist-server/server-dev')
+require('../dist-server/server-dev.js')

package/bin/things-factory-migration

@@ -50,7 +50,7 @@ async function doModePrompt() {
   process.env.NODE_ENV = answers.mode == 'development' ? 'development' : 'production'
   const { config } = require('@things-factory/env')
 
-  var ormconfig = require('@things-factory/shell/dist-server/initializers/ormconfig.js')
+  var ormconfig = require('../dist-server/initializers/ormconfig.js')
 
   if (ormconfig.host) {
     await confirmHost(ormconfig.host)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "10.1.149",
+  "version": "10.1.150",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -142,5 +142,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "816f88a9fa6110935a3f71740458db8f7469d2e3"
+  "gitHead": "39c135863f5f7455dcd80b8907550a1c91a86118"
 }

package/tests/bin-entries-resolve.test.ts

@@ -0,0 +1,38 @@
+/*
+ * Every module a bin script requires resolves, the way node resolves it from where the script stands.
+ *
+ * 10.1.149 gave shell an `exports` map whose `"./*": "./*"` entry adds no extension, so
+ * `require('@things-factory/shell/dist-server/server-dev')` stopped resolving and no app server started. A bin
+ * script now reaches its own package's files by a relative path, and another package's by a path that names its
+ * extension. This asks node itself — `require.resolve` in a child, from the bin directory — for every relative or
+ * `@things-factory/...` require of every bin a package declares, so an `exports` map is honoured exactly as at boot.
+ */
+import { spawnSync } from 'child_process'
+import { existsSync, readdirSync, readFileSync } from 'fs'
+import { dirname, join } from 'path'
+
+const packagesRoot = join(__dirname, '..', '..')
+
+const requires = readdirSync(packagesRoot).flatMap(name => {
+  const manifest = join(packagesRoot, name, 'package.json')
+  if (!existsSync(manifest)) return []
+  const bins = JSON.parse(readFileSync(manifest, 'utf8')).bin ?? {}
+  return Object.values<string>(typeof bins === 'string' ? { [name]: bins } : bins).flatMap(bin => {
+    const file = join(packagesRoot, name, bin)
+    const text = readFileSync(file, 'utf8')
+    return [...text.matchAll(/require\('((?:\.\.?\/|@things-factory\/)[^']+)'\)/g)].map(match => ({ bin: `${name}/${bin}`, dir: dirname(file), spec: match[1] }))
+  })
+})
+
+describe('bin scripts', () => {
+  it('require modules of their own and of other packages, so the check below is not empty', () => {
+    expect(requires.some(one => one.spec.startsWith('.'))).toBe(true)
+    expect(requires.some(one => one.spec.startsWith('@things-factory/'))).toBe(true)
+  })
+
+  it.each(requires.map(one => [one.bin, one.spec, one.dir]))('%s requires %s, and node resolves it', (_bin, spec, dir) => {
+    const run = spawnSync(process.execPath, ['-e', `process.stdout.write(require.resolve(${JSON.stringify(spec)}))`], { cwd: dir, encoding: 'utf8' })
+    expect(run.stderr).toBe('')
+    expect(existsSync(run.stdout)).toBe(true)
+  })
+})