refactor: modify the usage of mana-observable in mana-core code

weavefox · Feb 7, 2025 · 5d76fc2 · 5d76fc2
1 parent 67d759c
commit 5d76fc2
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 31 deletions.
diff --git a/packages/libro-common/src/mana-core/application/application-state.ts b/packages/libro-common/src/mana-core/application/application-state.ts
@@ -1,7 +1,6 @@
-import { prop } from '@difizen/mana-observable';
-
 import type { Event } from '../../mana-common/index.js';
 import { Emitter, Deferred } from '../../mana-common/index.js';
+import { prop } from '../../mana-observable/index.js';
 import { inject, singleton } from '../../mana-syringe/index.js';
 import { DebugService } from '../common/debug';
 

diff --git a/packages/libro-common/src/mana-core/command/command-registry.ts b/packages/libro-common/src/mana-core/command/command-registry.ts
@@ -1,11 +1,10 @@
-import { prop } from '@difizen/mana-observable';
-
 import {
   Emitter,
   WaitUntilEvent,
   Disposable,
   DisposableCollection,
 } from '../../mana-common/index.js';
+import { prop } from '../../mana-observable/index.js';
 import type { Contribution } from '../../mana-syringe/index.js';
 import { Syringe } from '../../mana-syringe/index.js';
 import { contrib, singleton } from '../../mana-syringe/index.js';

diff --git a/packages/libro-common/src/mana-core/components/context.tsx b/packages/libro-common/src/mana-core/components/context.tsx
@@ -1,4 +1,4 @@
-import { ObservableContext } from '@difizen/mana-observable';
+import { ObservableContext } from '../../mana-observable/index.js';
 import type { Syringe } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/components/hooks.tsx b/packages/libro-common/src/mana-core/components/hooks.tsx
@@ -1,4 +1,4 @@
-import { ObservableContext } from '@difizen/mana-observable';
+import { ObservableContext } from '../../mana-observable/index.js';
 import type { Syringe } from '../../mana-syringe/index.js';
 import { GlobalContainer } from '../../mana-syringe/index.js';
 import * as React from 'react';

diff --git a/packages/libro-common/src/mana-core/components/root-view-render.tsx b/packages/libro-common/src/mana-core/components/root-view-render.tsx
@@ -1,4 +1,4 @@
-import { useInject } from '@difizen/mana-observable';
+import { useInject } from '../../mana-observable/index.js';
 
 import { ViewManager, ViewRender } from '../view';
 

diff --git a/packages/libro-common/src/mana-core/configuration/configuration-provider.ts b/packages/libro-common/src/mana-core/configuration/configuration-provider.ts
@@ -1,5 +1,5 @@
 import type { MaybePromise } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { singleton, Syringe } from '../../mana-syringe/index.js';
 
 import type { ConfigurationNode } from './configuration-protocol';

diff --git a/packages/libro-common/src/mana-core/configuration/configuration-service.ts b/packages/libro-common/src/mana-core/configuration/configuration-service.ts
@@ -1,5 +1,5 @@
 import { Emitter } from '../../mana-common/index.js';
-import { getOrigin } from '@difizen/mana-observable';
+import { getOrigin } from '../../mana-observable/index.js';
 import type { Contribution } from '../../mana-syringe/index.js';
 import { contrib, inject, singleton } from '../../mana-syringe/index.js';
 

diff --git a/packages/libro-common/src/mana-core/configuration/hooks.ts b/packages/libro-common/src/mana-core/configuration/hooks.ts
@@ -1,4 +1,4 @@
-import { useInject } from '@difizen/mana-observable';
+import { useInject } from '../../mana-observable/index.js';
 import { useCallback, useEffect, useState } from 'react';
 
 import type { ConfigurationNode } from './configuration-protocol';

diff --git a/packages/libro-common/src/mana-core/configuration/validation.ts b/packages/libro-common/src/mana-core/configuration/validation.ts
@@ -1,4 +1,4 @@
-import { getOrigin } from '@difizen/mana-observable';
+import { getOrigin } from '../../mana-observable/index.js';
 import { singleton } from '../../mana-syringe/index.js';
 import Ajv from 'ajv';
 

diff --git a/packages/libro-common/src/mana-core/context/data-context.tsx b/packages/libro-common/src/mana-core/context/data-context.tsx
@@ -1,4 +1,8 @@
-import { getOrigin, ObservableContext, useInject } from '@difizen/mana-observable';
+import {
+  getOrigin,
+  ObservableContext,
+  useInject,
+} from '../../mana-observable/index.js';
 import * as React from 'react';
 
 import type { ManaContext } from '../module';

diff --git a/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts b/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts
@@ -7,7 +7,7 @@ import type { Emitter, Event } from '../../mana-common/index.js';
 import { Iterable } from '../../mana-common/index.js';
 import { PauseableEmitter } from '../../mana-common/index.js';
 import { objects } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { inject, injectable, singleton } from '../../mana-syringe/index.js';
 
 import type { CommandRegistry } from '../../command/index';

diff --git a/packages/libro-common/src/mana-core/menu/default-menu-node.ts b/packages/libro-common/src/mana-core/menu/default-menu-node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import type { Disposable, Event } from '../../mana-common/index.js';
 import { Emitter } from '../../mana-common/index.js';
-import { getOrigin, prop } from '@difizen/mana-observable';
+import { getOrigin, prop } from '../../mana-observable/index.js';
 import { inject, transient } from '../../mana-syringe/index.js';
 
 import { CommandRegistry } from '../command/command-registry';

diff --git a/packages/libro-common/src/mana-core/theme/theme-service.ts b/packages/libro-common/src/mana-core/theme/theme-service.ts
@@ -1,7 +1,7 @@
 import type { Event } from '../../mana-common/index.js';
 import { isPromiseLike } from '../../mana-common/index.js';
 import { Emitter, Disposable, objects } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { singleton } from '../../mana-syringe/index.js';
 
 import { localStorageService } from '../common';

diff --git a/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts b/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts
@@ -1,6 +1,6 @@
 import type { Event } from '../../mana-common/index.js';
 import { Emitter } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { inject } from '../../mana-syringe/index.js';
 import { transient } from '../../mana-syringe/index.js';
 

diff --git a/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts b/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts
@@ -1,5 +1,5 @@
 import { Emitter } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import type { Contribution } from '../../mana-syringe/index.js';
 import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js';
 

diff --git a/packages/libro-common/src/mana-core/view/default-slot-view.tsx b/packages/libro-common/src/mana-core/view/default-slot-view.tsx
@@ -1,6 +1,12 @@
 /* eslint-disable @typescript-eslint/unified-signatures */
 import { Disposable, DisposableCollection } from '../../mana-common/index.js';
-import { equals, getOrigin, Notifier, prop, useInject } from '@difizen/mana-observable';
+import {
+  equals,
+  getOrigin,
+  Notifier,
+  prop,
+  useInject,
+} from '../../mana-observable/index.js';
 import { inject, transient } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/default-view.tsx b/packages/libro-common/src/mana-core/view/default-view.tsx
@@ -1,6 +1,6 @@
 import type { Event } from '../../mana-common/index.js';
 import { DisposableCollection, Emitter } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { transient } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/portal-slot-view.tsx b/packages/libro-common/src/mana-core/view/portal-slot-view.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/unified-signatures */
 import { Disposable, DisposableCollection } from '../../mana-common/index.js';
-import { equals, getOrigin, prop, useInject } from '@difizen/mana-observable';
+import { equals, getOrigin, prop, useInject } from '../../mana-observable/index.js';
 import { inject, transient } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/root-view.tsx b/packages/libro-common/src/mana-core/view/root-view.tsx
@@ -1,5 +1,5 @@
 import { timeout } from '../../mana-common/index.js';
-import { prop, useInject } from '@difizen/mana-observable';
+import { prop, useInject } from '../../mana-observable/index.js';
 import { inject, singleton } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/slot-view-manager.ts b/packages/libro-common/src/mana-core/view/slot-view-manager.ts
@@ -2,7 +2,7 @@ import type { Newable } from '../../mana-common/index.js';
 import { Emitter } from '../../mana-common/index.js';
 import { Deferred } from '../../mana-common/index.js';
 import { Disposable, Priority } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { contrib, inject, singleton } from '../../mana-syringe/index.js';
 import type { Contribution } from '../../mana-syringe/index.js';
 

diff --git a/packages/libro-common/src/mana-core/view/slot.tsx b/packages/libro-common/src/mana-core/view/slot.tsx
@@ -1,5 +1,5 @@
 import type { Newable } from '../../mana-common/index.js';
-import { useInject, getOrigin } from '@difizen/mana-observable';
+import { useInject, getOrigin } from '../../mana-observable/index.js';
 import type { ReactNode } from 'react';
 import { useEffect } from 'react';
 import { memo } from 'react';

diff --git a/packages/libro-common/src/mana-core/view/title.tsx b/packages/libro-common/src/mana-core/view/title.tsx
@@ -1,4 +1,4 @@
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { transient } from '../../mana-syringe/index.js';
 import type * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/utils.tsx b/packages/libro-common/src/mana-core/view/utils.tsx
@@ -1,4 +1,4 @@
-import { getOrigin } from '@difizen/mana-observable';
+import { getOrigin } from '../../mana-observable/index.js';
 import React from 'react';
 /**
  * hack

diff --git a/packages/libro-common/src/mana-core/view/view-container.tsx b/packages/libro-common/src/mana-core/view/view-container.tsx
@@ -1,4 +1,4 @@
-import { ObservableContext, useInject } from '@difizen/mana-observable';
+import { ObservableContext, useInject } from '../../mana-observable/index.js';
 import type { Syringe } from '../../mana-syringe/index.js';
 import * as React from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/view-context.tsx b/packages/libro-common/src/mana-core/view/view-context.tsx
@@ -1,4 +1,4 @@
-import { getOrigin, ObservableContext } from '@difizen/mana-observable';
+import { getOrigin, ObservableContext } from '../../mana-observable/index.js';
 import * as React from 'react';
 
 import type { ManaContext } from '../module';

diff --git a/packages/libro-common/src/mana-core/view/view-manager.ts b/packages/libro-common/src/mana-core/view/view-manager.ts
@@ -7,7 +7,7 @@ import type {
 } from '../../mana-common/index.js';
 import { DisposableCollection } from '../../mana-common/index.js';
 import { Priority, Emitter } from '../../mana-common/index.js';
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import type { Contribution } from '../../mana-syringe/index.js';
 import { contrib, inject, singleton } from '../../mana-syringe/index.js';
 

diff --git a/packages/libro-common/src/mana-core/view/view-meta.ts b/packages/libro-common/src/mana-core/view/view-meta.ts
@@ -1,4 +1,4 @@
-import { getOrigin } from '@difizen/mana-observable';
+import { getOrigin } from '../../mana-observable/index.js';
 
 import type { ManaContext } from '../module';
 

diff --git a/packages/libro-common/src/mana-core/view/view-render.tsx b/packages/libro-common/src/mana-core/view/view-render.tsx
@@ -1,4 +1,4 @@
-import { useInject } from '@difizen/mana-observable';
+import { useInject } from '../../mana-observable/index.js';
 import type { ReactNode } from 'react';
 import { memo } from 'react';
 

diff --git a/packages/libro-common/src/mana-core/view/view-storage.ts b/packages/libro-common/src/mana-core/view/view-storage.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { prop } from '@difizen/mana-observable';
+import { prop } from '../../mana-observable/index.js';
 import { inject, singleton } from '../../mana-syringe/index.js';
 
 import { DebugService, StorageService } from '../common';