@dxos/context - npm Package Compare versions

Comparing version 0.5.9-main.cb71230 to 0.5.9-main.cd3aaf7

dist/lib/browser/meta.json

@@ -1,1 +0,1 @@
-{"inputs":{"packages/common/context/src/context-disposed-error.ts":{"bytes":853,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":22853,"imports":[{"path":"@dxos/node-std/util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3096,"imports":[{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/resource.ts":{"bytes":13662,"imports":[{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":809,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"},{"path":"packages/common/context/src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":18172},"packages/common/context/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/node-std/util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","ContextDisposedError","LifecycleState","Resource","cancelWithContext","openInContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":6283},"packages/common/context/src/context-disposed-error.ts":{"bytesInOutput":106},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410},"packages/common/context/src/resource.ts":{"bytesInOutput":3372}},"bytes":10575}}}
+{"inputs":{"packages/common/context/src/context-disposed-error.ts":{"bytes":853,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":25119,"imports":[{"path":"@dxos/node-std/util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3096,"imports":[{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/resource.ts":{"bytes":13662,"imports":[{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":809,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"},{"path":"packages/common/context/src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":19359},"packages/common/context/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/node-std/util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","ContextDisposedError","LifecycleState","Resource","cancelWithContext","openInContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":6814},"packages/common/context/src/context-disposed-error.ts":{"bytesInOutput":106},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410},"packages/common/context/src/resource.ts":{"bytesInOutput":3372}},"bytes":11106}}}

dist/lib/node/meta.json

@@ -1,1 +0,1 @@
-{"inputs":{"packages/common/context/src/context-disposed-error.ts":{"bytes":853,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":22853,"imports":[{"path":"node:util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3096,"imports":[{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/resource.ts":{"bytes":13662,"imports":[{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":809,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"},{"path":"packages/common/context/src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":18172},"packages/common/context/dist/lib/node/index.cjs":{"imports":[{"path":"node:util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","ContextDisposedError","LifecycleState","Resource","cancelWithContext","openInContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":6273},"packages/common/context/src/context-disposed-error.ts":{"bytesInOutput":106},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410},"packages/common/context/src/resource.ts":{"bytesInOutput":3372}},"bytes":10565}}}
+{"inputs":{"packages/common/context/src/context-disposed-error.ts":{"bytes":853,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":25119,"imports":[{"path":"node:util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3096,"imports":[{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"}],"format":"esm"},"packages/common/context/src/resource.ts":{"bytes":13662,"imports":[{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":809,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed-error.ts","kind":"import-statement","original":"./context-disposed-error"},{"path":"packages/common/context/src/resource.ts","kind":"import-statement","original":"./resource"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":19359},"packages/common/context/dist/lib/node/index.cjs":{"imports":[{"path":"node:util","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","ContextDisposedError","LifecycleState","Resource","cancelWithContext","openInContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":6804},"packages/common/context/src/context-disposed-error.ts":{"bytesInOutput":106},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410},"packages/common/context/src/resource.ts":{"bytesInOutput":3372}},"bytes":11096}}}

dist/types/src/context.d.ts

 /// <reference types="node" />
 import { inspect } from 'node:util';
+import { type CallMetadata } from '@dxos/log';
 export type ContextErrorHandler = (error: Error, ctx: Context) => void;
@@ -15,3 +16,3 @@ export type DisposeCallback = () => any | Promise<any>;
     maxSafeDisposeCallbacks: number;
-    constructor({ name, parent, attributes, onError }?: CreateContextParams);
+    constructor(params?: CreateContextParams, callMeta?: Partial<CallMetadata>);
     get disposed(): boolean;
@@ -35,2 +36,3 @@ get disposeCallbacksLength(): number;
      * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.
+     * @returns true if there were no errors during the dispose process.
      */
@@ -49,3 +51,4 @@ dispose(throwOnError?: boolean): Promise<boolean>;
     toString(): string;
+    [Symbol.asyncDispose](): Promise<void>;
 }
 //# sourceMappingURL=context.d.ts.map

package.json

 {
   "name": "@dxos/context",
-  "version": "0.5.9-main.cb71230",
+  "version": "0.5.9-main.cd3aaf7",
   "description": "Async utils.",
@@ -19,5 +19,5 @@ "homepage": "https://dxos.org",
   "dependencies": {
-    "@dxos/log": "0.5.9-main.cb71230",
-    "@dxos/util": "0.5.9-main.cb71230",
-    "@dxos/node-std": "0.5.9-main.cb71230"
+    "@dxos/log": "0.5.9-main.cd3aaf7",
+    "@dxos/node-std": "0.5.9-main.cd3aaf7",
+    "@dxos/util": "0.5.9-main.cd3aaf7"
   },
@@ -24,0 +24,0 @@ "publishConfig": {

src/context.ts

@@ -7,3 +7,3 @@ //
 
-import { log } from '@dxos/log';
+import { type CallMetadata, log } from '@dxos/log';
 import { safeInstanceof } from '@dxos/util';
@@ -24,2 +24,4 @@
 
+const DEBUG_LOG_DISPOSE = false;
+
 /**
@@ -59,7 +61,7 @@ * Maximum number of dispose callbacks before we start logging warnings.
 
-  constructor({ name, parent, attributes = {}, onError = DEFAULT_ERROR_HANDLER }: CreateContextParams = {}) {
-    this.#name = name;
-    this.#parent = parent;
-    this.#attributes = attributes;
-    this.#onError = onError;
+  constructor(params: CreateContextParams = {}, callMeta?: Partial<CallMetadata>) {
+    this.#name = getContextName(params, callMeta);
+    this.#parent = params.parent;
+    this.#attributes = params.attributes ?? {};
+    this.#onError = params.onError ?? DEFAULT_ERROR_HANDLER;
   }
@@ -91,3 +93,3 @@
         } catch (error: any) {
-          log.catch(error);
+          log.catch(error, { context: this.#name });
         }
@@ -100,2 +102,3 @@ })();
       log.warn('Context has a large number of dispose callbacks (this might be a memory leak).', {
+        context: this.#name,
         count: this.#disposeCallbacks.length,
@@ -120,2 +123,3 @@ });
    * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.
+   * @returns true if there were no errors during the dispose process.
    */
@@ -142,3 +146,3 @@ async dispose(throwOnError = false): Promise<boolean> {
 
-    if (this.#name) {
+    if (DEBUG_LOG_DISPOSE) {
       log('disposing', { context: this.#name, count: callbacks.length });
@@ -169,3 +173,3 @@ }
     resolveDispose(clean);
-    if (this.#name) {
+    if (DEBUG_LOG_DISPOSE) {
       log('disposed', { context: this.#name });
@@ -236,2 +240,17 @@ }
   }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.dispose();
+  }
 }
+
+const getContextName = (params: CreateContextParams, callMeta?: Partial<CallMetadata>): string | undefined => {
+  if (params.name) {
+    return params.name;
+  }
+  if (callMeta?.F?.length) {
+    const pathSegments = callMeta?.F.split('/');
+    return `${pathSegments[pathSegments.length - 1]}#${callMeta?.L ?? 0}`;
+  }
+  return undefined;
+};

No alert changes

Improved metrics

Total package byte prevSize

91569

increased by4.99%

Lines of code

1413

increased by3.59%

Dependency changes

• + Added@dxos/[e-mail]3aaf7(transitive)

• + Added@dxos/[e-mail]3aaf7(transitive)

• + Added@dxos/[e-mail]3aaf7(transitive)

• + Added@dxos/[e-mail]3aaf7(transitive)

• + Added@dxos/[e-mail]3aaf7(transitive)

• + Added@dxos/[e-mail]3aaf7(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• - Removed@dxos/[e-mail]71230(transitive)

• Updated@dxos/[e-mail]3aaf7

• Updated@dxos/[e-mail]3aaf7

• Updated@dxos/[e-mail]3aaf7