@quo-systems/dock 0.2.5 → 0.2.6

package/dist/harbor/disk.js

@@ -25,6 +25,7 @@ import { mkdir, readFile, writeFile, unlink, stat } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join, resolve, isAbsolute } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { register } from 'node:module';
 import process from 'node:process';
 import { User, Desk, Avatar } from '../beings/index.js';
 import { setup } from '../beings/setup.js';
@@ -35,12 +36,24 @@ export const BUILT_IN = { User, Desk, Avatar };
 // a second harbor in the same pid would pass that check while still being a
 // second ward with one pk.
 const HELD = new Set();
+// A class file in the harbor folder resolves its packages from where the
+// dock is installed, `resolve.ts`: the folder has no node_modules and is not
+// meant to. Registered once per process, before the first class loads.
+let hooked = false;
+function hook() {
+    if (hooked)
+        return;
+    hooked = true;
+    const self = import.meta.url;
+    register(new URL(self.endsWith('.ts') ? './resolve.ts' : './resolve.js', self), { parentURL: self, data: { parent: self } });
+}
 // The class source is a module. Every export that is a class is a class the
 // harbor holds, under its export name. The harbor never sees a body: it
 // constructs when a ward names a class, and never chooses one.
 async function loadClasses(path) {
     if (!existsSync(path))
         return {};
+    hook();
     // Keyed by the file's own time, so a source that changed on disk is read
     // again and a harbor boots on what it pins, not on what it once loaded.
     const { mtimeMs } = await stat(path);

package/dist/harbor/resolve.d.ts

@@ -0,0 +1,16 @@
+type Context = {
+    parentURL?: string;
+    conditions: string[];
+    importAttributes: Record<string, string>;
+};
+type Resolved = {
+    url: string;
+    format?: string | null;
+    shortCircuit?: boolean;
+};
+type Next = (specifier: string, context: Context) => Promise<Resolved>;
+export declare function initialize(data: {
+    parent: string;
+}): void;
+export declare function resolve(specifier: string, context: Context, next: Next): Promise<Resolved>;
+export {};

package/dist/harbor/resolve.js

@@ -0,0 +1,17 @@
+let parent = '';
+export function initialize(data) {
+    parent = data.parent;
+}
+const bare = (s) => !s.startsWith('.') && !s.startsWith('/') && !/^[a-z]+:/i.test(s);
+export async function resolve(specifier, context, next) {
+    try {
+        return await next(specifier, context);
+    }
+    catch (e) {
+        const missing = e.code === 'ERR_MODULE_NOT_FOUND';
+        const from = context.parentURL ?? '';
+        if (missing && parent && bare(specifier) && from.startsWith('file:') && !from.includes('/node_modules/'))
+            return next(specifier, { ...context, parentURL: parent });
+        throw e;
+    }
+}

package/harbor/disk.ts

@@ -17,6 +17,7 @@ import { mkdir, readFile, writeFile, unlink, stat } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join, resolve, isAbsolute } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { register } from 'node:module';
 import process from 'node:process';
 import type { BeingClass } from '@quo-systems/quo';
 import { User, Desk, Avatar } from '../beings/index.ts';
@@ -33,11 +34,23 @@ export const BUILT_IN: Record<string, BeingClass> = { User, Desk, Avatar };
 // second ward with one pk.
 const HELD = new Set<string>();
 
+// A class file in the harbor folder resolves its packages from where the
+// dock is installed, `resolve.ts`: the folder has no node_modules and is not
+// meant to. Registered once per process, before the first class loads.
+let hooked = false;
+function hook(): void {
+  if (hooked) return;
+  hooked = true;
+  const self = import.meta.url;
+  register(new URL(self.endsWith('.ts') ? './resolve.ts' : './resolve.js', self), { parentURL: self, data: { parent: self } });
+}
+
 // The class source is a module. Every export that is a class is a class the
 // harbor holds, under its export name. The harbor never sees a body: it
 // constructs when a ward names a class, and never chooses one.
 async function loadClasses(path: string): Promise<Record<string, BeingClass>> {
   if (!existsSync(path)) return {};
+  hook();
   // Keyed by the file's own time, so a source that changed on disk is read
   // again and a harbor boots on what it pins, not on what it once loaded.
   const { mtimeMs } = await stat(path);

package/harbor/quo-harbor.md

@@ -339,6 +339,15 @@ core plus files, the loader and the pid, and holds the `ws` listener's end of
 every socket dialed to it; the browser harbor, `browser.ts`, is the core plus
 IndexedDB, the built-in beings, the lock and one dialer per world.
 
+The harbor folder is the device's and not a package: it has no node_modules
+and is not meant to, and a class file in it imports the library by name like
+any code. So the disk harbor resolves a class file's packages from where the
+dock itself is installed, `resolve.ts`, a module resolution hook registered
+once before the first class loads: a bare name that does not resolve from a
+file outside any node_modules is resolved again from the dock's own place.
+A class sees the packages the daemon sees, the library and the dock's own,
+and one copy of each, so a `Being` in a class file is the daemon's `Being`.
+
 A tab's store keeps values through JSON, as a file does, because the ward
 hands its partition out through a guard that structured clone refuses.
 The daemon's `/quo` and `/health` answer any origin, with the preflight a

package/harbor/resolve.ts

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+// How a class file the harbor folder holds finds its packages. The folder
+// is the device's, not a package: it has no node_modules, and a class in it
+// that imports `@quo-systems/quo` would otherwise fail to resolve from where
+// it sits. This is a module resolution hook, registered once by the disk
+// harbor: a bare specifier that does not resolve from a file outside any
+// node_modules is resolved again from where the dock itself is installed,
+// so a class file sees exactly the packages the daemon sees, the library
+// and the dock's own, and one copy of each.
+type Context = { parentURL?: string; conditions: string[]; importAttributes: Record<string, string> };
+type Resolved = { url: string; format?: string | null; shortCircuit?: boolean };
+type Next = (specifier: string, context: Context) => Promise<Resolved>;
+
+let parent = '';
+
+export function initialize(data: { parent: string }): void {
+  parent = data.parent;
+}
+
+const bare = (s: string) => !s.startsWith('.') && !s.startsWith('/') && !/^[a-z]+:/i.test(s);
+
+export async function resolve(specifier: string, context: Context, next: Next): Promise<Resolved> {
+  try {
+    return await next(specifier, context);
+  } catch (e) {
+    const missing = (e as { code?: string }).code === 'ERR_MODULE_NOT_FOUND';
+    const from = context.parentURL ?? '';
+    if (missing && parent && bare(specifier) && from.startsWith('file:') && !from.includes('/node_modules/')) return next(specifier, { ...context, parentURL: parent });
+    throw e;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quo-systems/dock",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "The dock: what every estate on Quo needs and nobody writes twice. A daemon and the quo command, the front desk, the user being and the avatar, harbors on disk, in a tab and on the edge, the model sides and the screen.",
   "keywords": [
     "quo",
@@ -72,7 +72,7 @@
     "build": "rm -rf dist && tsc -p tsconfig.build.json && cp harbor/edge/platform.d.ts dist/harbor/edge/ && cp -R cli/estate dist/cli/",
     "test": "node --test \"test/*.test.ts\"",
     "check:terrain": "node --test \"test/terrain/*.test.ts\"",
-    "prepublishOnly": "cd ../.. && npm run check && npm run check:terrain"
+    "prepublishOnly": "test \"$QUO_GATED\" = 1 || { echo 'publish from the root, gated once: npm run release' >&2; exit 1; }"
   },
   "dependencies": {
     "@aparajita/capacitor-secure-storage": "^8.0.0",
@@ -80,7 +80,7 @@
     "@capacitor/core": "^8.5.1",
     "@capacitor/filesystem": "^8.1.3",
     "@modelcontextprotocol/sdk": "^1.30.0",
-    "@quo-systems/quo": "^0.2.5",
+    "@quo-systems/quo": "^0.2.6",
     "esbuild": "^0.28.2",
     "ws": "^8.21.3"
   },