@syncbridge/common 0.7.1 → 0.9.0

package/classes/base-element.d.ts

@@ -3,7 +3,6 @@ import { ServiceStatus } from '../models/index.js';
 import type { ComponentBase } from './component-base.js';
 import { Runnable } from './runnable.js';
 export declare abstract class BaseElement<TEvents extends BaseElement.Events = BaseElement.Events> extends Runnable<TEvents> {
-    static id: string;
     static uri: string;
     static packageName: string;
     static className: string;

package/classes/base-element.js

@@ -1,7 +1,6 @@
 import { ServiceStatus } from '../models/index.js';
 import { Runnable } from './runnable.js';
 export class BaseElement extends Runnable {
-    static id;
     static uri;
     static packageName;
     static className;

package/constants.js

@@ -1,4 +1,4 @@
-export const version = '0.7.1';
+export const version = '0.9.0';
 export const CLASS_METADATA = Symbol.for('CLASS_METADATA');
 export const CLASS_TYPE = Symbol.for('CLASS_TYPE');
 export const VARIABLE_CONTAINER = Symbol.for('VARIABLE_CONTAINER');

package/decorators/component.decorator.js

@@ -33,15 +33,9 @@ export function Component(options) {
         Reflect.defineMetadata(CLASS_TYPE, 'component', target);
         const packageName = pkgjson.syncbridge?.name || pkgjson.name;
         const uri = packageName + ':' + className;
-        const id = uri
-            .replace('@', '')
-            .replace(':', '__')
-            .replace(/\W/g, '_')
-            .toLowerCase();
         const metadata = defineOwnMetadata(target, CLASS_METADATA, {
             mergeBase: true,
             overwrite: {
-                id,
                 uri,
                 displayName: className,
                 version: pkgjson.version,
@@ -55,7 +49,6 @@ export function Component(options) {
         if (baseMetadata) {
             metadata.interfaces = Array.from(new Set([...(baseMetadata?.interfaces || []), base.uri]));
         }
-        target.id = id;
         target.uri = uri;
         target.packageName = packageName;
         target.className = className;

package/decorators/processor.decorator.js

@@ -34,15 +34,9 @@ export function Processor(options) {
         Reflect.defineMetadata(CLASS_TYPE, 'processor', target);
         const packageName = pkgjson.syncbridge?.name || pkgjson.name;
         const uri = packageName + ':' + className;
-        const id = uri
-            .replace('@', '')
-            .replace(':', '__')
-            .replace(/\W/g, '_')
-            .toLowerCase();
         defineOwnMetadata(target, CLASS_METADATA, {
             mergeBase: true,
             overwrite: {
-                id,
                 uri,
                 displayName: className,
                 version: pkgjson.version,
@@ -50,7 +44,6 @@ export function Processor(options) {
                 ...omit(options, ['uri']),
             },
         });
-        target.id = id;
         target.uri = uri;
         target.packageName = packageName;
         target.className = className;

package/index.d.ts

@@ -20,3 +20,4 @@ export * from './utils/decode-profile.js';
 export * from './utils/materialize-metadata.js';
 export * from './utils/normalize-metadata.js';
 export * from './utils/type-guartds.js';
+export * from './utils/uri-to-id.js';

package/index.js

@@ -20,3 +20,4 @@ export * from './utils/decode-profile.js';
 export * from './utils/materialize-metadata.js';
 export * from './utils/normalize-metadata.js';
 export * from './utils/type-guartds.js';
+export * from './utils/uri-to-id.js';

package/models/metadata/element-metadata.d.ts

@@ -7,7 +7,6 @@ import { VariableMetadataRecord } from './variable-metadata.js';
 export declare class ElementMetadata {
     constructor(init?: Partial<ElementMetadata>);
     abstract?: boolean;
-    id: string;
     uri: string;
     displayName: string;
     iconUrl?: string;

package/models/metadata/element-metadata.js

@@ -12,14 +12,6 @@ let ElementMetadata = class ElementMetadata {
     }
     abstract;
 };
-__decorate([
-    ApiField({
-        label: 'Id',
-        description: 'Web friendly unique identifier',
-        examples: ['syncbridge_net__tcpclient', 'syncbridge_sqb__sqbclient'],
-    }),
-    __metadata("design:type", String)
-], ElementMetadata.prototype, "id", void 0);
 __decorate([
     ApiField({
         label: 'Class URI',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncbridge/common",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "SyncBridge Common utilities",
   "author": "Panates Inc",
   "license": "MIT",

package/registry/extension-package.d.ts

@@ -29,7 +29,6 @@ export declare abstract class ExtensionBase {
     readonly name: string;
     readonly packageName: string;
     protected constructor(pkg: ExtensionPackage, exportName: string, metadata: ElementMetadata, ctor?: Type<BaseElement>);
-    get id(): string;
     get uri(): string;
     get displayName(): string;
     get version(): string;

package/registry/extension-package.js

@@ -28,9 +28,6 @@ export class ExtensionBase {
         this.name = name;
         this.packageName = packageName;
     }
-    get id() {
-        return this.metadata.id;
-    }
     get uri() {
         return this.metadata.uri;
     }

package/registry/extension-registry.d.ts

@@ -16,10 +16,8 @@ export declare class ExtensionRegistry {
     protected static [instanceSymbol]: ExtensionRegistry;
     static get packages(): ResponsiveMap<ExtensionPackage[]>;
     static get components(): ResponsiveMap<ComponentExtension[]>;
-    static get componentsById(): ResponsiveMap<ComponentExtension[]>;
     static get componentsByClassName(): ResponsiveMap<ComponentExtension[]>;
     static get processors(): ResponsiveMap<ProcessorExtension[]>;
-    static get processorsById(): ResponsiveMap<ProcessorExtension[]>;
     static get processorsByClassName(): ResponsiveMap<ProcessorExtension[]>;
     static setResolver(fn: ExtensionRegistry.PackageResolver | undefined): void;
     static findComponent(uri: string, version?: string): ComponentExtension | undefined;
@@ -33,10 +31,8 @@ export declare class ExtensionRegistry {
     protected _resolver: ExtensionRegistry.PackageResolver;
     readonly packages: ResponsiveMap<ExtensionPackage[]>;
     readonly components: ResponsiveMap<ComponentExtension[]>;
-    readonly componentsById: ResponsiveMap<ComponentExtension[]>;
     readonly componentsByClassName: ResponsiveMap<ComponentExtension[]>;
     readonly processors: ResponsiveMap<ProcessorExtension[]>;
-    readonly processorsById: ResponsiveMap<ProcessorExtension[]>;
     readonly processorsByClassName: ResponsiveMap<ProcessorExtension[]>;
     /**
      *

package/registry/extension-registry.js

@@ -8,6 +8,7 @@ import { SbError } from '../classes/sb-error.js';
 import { CLASS_METADATA, CLASS_TYPE } from '../constants.js';
 import { locatePackageJson } from '../utils/locate-package-json.js';
 import { normalizeComponentMetadata, normalizeProcessorMetadata, } from '../utils/normalize-metadata.js';
+import { uriToId } from '../utils/uri-to-id.js';
 import { ComponentExtension, ExtensionPackage, ProcessorExtension, } from './extension-package.js';
 const instanceSymbol = Symbol.for('instance');
 /**
@@ -26,18 +27,12 @@ export class ExtensionRegistry {
     static get components() {
         return this[instanceSymbol].components;
     }
-    static get componentsById() {
-        return this[instanceSymbol].componentsById;
-    }
     static get componentsByClassName() {
         return this[instanceSymbol].componentsByClassName;
     }
     static get processors() {
         return this[instanceSymbol].processors;
     }
-    static get processorsById() {
-        return this[instanceSymbol].processorsById;
-    }
     static get processorsByClassName() {
         return this[instanceSymbol].processorsByClassName;
     }
@@ -68,10 +63,8 @@ export class ExtensionRegistry {
     _resolver = import.meta.resolve;
     packages = new ResponsiveMap();
     components = new ResponsiveMap();
-    componentsById = new ResponsiveMap();
     componentsByClassName = new ResponsiveMap();
     processors = new ResponsiveMap();
-    processorsById = new ResponsiveMap();
     processorsByClassName = new ResponsiveMap();
     /**
      *
@@ -83,7 +76,9 @@ export class ExtensionRegistry {
      *
      */
     findComponent(uri, version = '*') {
-        return (this.components.get(uri) || this.componentsById.get(uri))?.find(v => semver.satisfies(v.version, version || '*'));
+        return this.components
+            .get(uriToId(uri))
+            ?.find(v => semver.satisfies(v.version, version || '*'));
     }
     /**
      *
@@ -99,7 +94,9 @@ export class ExtensionRegistry {
      *
      */
     findProcessor(uri, version = '*') {
-        return (this.processors.get(uri) || this.processorsById.get(uri))?.find(v => semver.satisfies(v.version, version || '*'));
+        return this.processors
+            .get(uriToId(uri))
+            ?.find(v => semver.satisfies(v.version, version || '*'));
     }
     /**
      *
@@ -231,14 +228,14 @@ export class ExtensionRegistry {
         pkgVersions.sort((a, b) => a.version.localeCompare(b.version));
         if (pkg.components?.length) {
             for (const cmp of pkg.components) {
-                if (this.processors.get(cmp.uri))
+                if (this.findProcessor(cmp.uri))
                     throw new SbError(`Component "${cmp.uri}" is already registered as a processor.`);
                 /** Store to components */
-                let items = this.components.get(cmp.uri);
+                const id = uriToId(cmp.uri);
+                let items = this.components.get(id);
                 if (!items) {
                     items = [];
-                    this.components.set(cmp.uri, items);
-                    this.componentsById.set(cmp.id, items);
+                    this.components.set(id, items);
                 }
                 i = items.findIndex(v => v.version === cmp.version);
                 if (i >= 0)
@@ -260,14 +257,14 @@ export class ExtensionRegistry {
         }
         if (pkg.processors?.length) {
             for (const prc of pkg.processors) {
-                if (this.components.get(prc.uri))
+                if (this.findComponent(prc.uri))
                     throw new SbError(`Processor "${prc.uri}" is already registered as a component.`);
                 /** Store to processors */
-                let items = this.processors.get(prc.uri);
+                const id = uriToId(prc.uri);
+                let items = this.processors.get(id);
                 if (!items) {
                     items = [];
-                    this.processors.set(prc.uri, items);
-                    this.processorsById.set(prc.id, items);
+                    this.processors.set(id, items);
                 }
                 i = items.findIndex(v => v.version === prc.version);
                 if (i >= 0)

package/utils/normalize-metadata.js

@@ -23,7 +23,6 @@ export async function normalizeProcessorMetadata(metadata) {
 export async function normalizeProcessorMetadataSilent(metadata) {
     const decoder = await getProcMetadataTypeDecoder();
     let cloned = deepClone({
-        id: metadata.id,
         uri: metadata.uri,
         displayName: metadata.displayName,
         description: metadata.description,
@@ -68,7 +67,6 @@ export async function normalizeComponentMetadata(metadata) {
 export async function normalizeComponentMetadataSilent(metadata) {
     const decoder = await getCompMetadataTypeDecoder();
     let cloned = deepClone({
-        id: metadata.id,
         uri: metadata.uri,
         displayName: metadata.displayName,
         description: metadata.description,

package/utils/uri-to-id.d.ts

@@ -0,0 +1 @@
+export declare function uriToId(uri: string): string;

package/utils/uri-to-id.js

@@ -0,0 +1,7 @@
+export function uriToId(uri) {
+    return uri
+        .replace('@', '')
+        .replace(':', '__')
+        .replace(/\W/g, '_')
+        .toLowerCase();
+}