@syncbridge/common 0.5.4 → 0.5.5

package/constants.js

@@ -1,4 +1,4 @@
-export const version = '0.5.4';
+export const version = '0.5.5';
 export const OWN_ELEMENT_METADATA = Symbol.for('OWN_ELEMENT_METADATA');
 export const COMPONENT_OPTIONS = Symbol.for('COMPONENT_OPTIONS');
 export const PROCESSOR_OPTIONS = Symbol.for('PROCESSOR_OPTIONS');

package/package.json

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

package/registry/extension-package.d.ts

@@ -21,7 +21,7 @@ export declare class ExtensionPackage {
      * @static
      */
     static fromDirectory(directory: string): Promise<ExtensionPackage>;
-    static fromNodePackage(specifier: string, resolver?: (name: string) => string): Promise<ExtensionPackage>;
+    static fromNodePackage(specifier: string, parentPath?: string | URL): Promise<ExtensionPackage>;
 }
 /**
  *

package/registry/extension-package.js

@@ -1,5 +1,6 @@
 import 'reflect-metadata';
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -118,10 +119,11 @@ export class ExtensionPackage {
         out.sortVersions();
         return out;
     }
-    static async fromNodePackage(specifier, resolver = import.meta.resolve) {
+    static async fromNodePackage(specifier, parentPath) {
         const compMetadataTypeDecoder = await getCompMetadataTypeDecoder();
         const procMetadataTypeDecoder = await getProcMetadataTypeDecoder();
-        let entryPoint = fileURLToPath(resolver(specifier));
+        const resolver = createRequire(parentPath || import.meta.url).resolve;
+        let entryPoint = resolver(specifier);
         const pkgJson = locatePkgJson(path.dirname(entryPoint));
         if (!pkgJson) {
             throw new TypeError(`Can't locate package.json file for "${specifier}"`);

package/registry/extension-registry.d.ts

@@ -1,43 +1,37 @@
 import { Type } from 'ts-gems';
 import { ExtensionPackage, ExtensionPackageComponent, ExtensionPackageProcessor } from './extension-package.js';
 export declare namespace ExtensionRegistry {
-    let _resolver: {
-        (specifier: string): string;
-        (specifier: string, parent?: string | import("node:url").URL): string;
-    };
-    export const packages: Map<string, ExtensionPackage[]>;
-    export const components: Map<string, ExtensionPackageComponent[]>;
-    export const processors: Map<string, ExtensionPackageProcessor[]>;
+    const packages: Map<string, ExtensionPackage[]>;
+    const components: Map<string, ExtensionPackageComponent[]>;
+    const processors: Map<string, ExtensionPackageProcessor[]>;
     /**
      *
      */
-    export function findComponent(className: string, version?: string): ExtensionPackageComponent | undefined;
+    function findComponent(className: string, version?: string): ExtensionPackageComponent | undefined;
     /**
      *
      */
-    export function getComponent(className: string, version?: string): ExtensionPackageComponent;
+    function getComponent(className: string, version?: string): ExtensionPackageComponent;
     /**
      *
      */
-    export function findProcessor(className: string, version?: string): ExtensionPackageProcessor | undefined;
+    function findProcessor(className: string, version?: string): ExtensionPackageProcessor | undefined;
     /**
      *
      */
-    export function getProcessor(className: string, version?: string): ExtensionPackageProcessor;
+    function getProcessor(className: string, version?: string): ExtensionPackageProcessor;
     /**
      *
-     * @param resolver
      */
-    export function setResolver(resolver: typeof _resolver): void;
+    function setParentPath(value: string | URL): void;
     /**
      *
      */
-    export function registerExtensionPackage(directory: string): Promise<ExtensionPackage>;
+    function registerExtensionPackage(directory: string): Promise<ExtensionPackage>;
     /**
      *
      */
-    export function registerNodePackage(specifier: string): Promise<ExtensionPackage>;
-    export function registerComponent(ctor: Type): Promise<ExtensionPackageComponent | undefined>;
-    export function registerProcessor(ctor: Type): Promise<ExtensionPackageProcessor | undefined>;
-    export {};
+    function registerNodePackage(specifier: string): Promise<ExtensionPackage>;
+    function registerComponent(ctor: Type): Promise<ExtensionPackageComponent | undefined>;
+    function registerProcessor(ctor: Type): Promise<ExtensionPackageProcessor | undefined>;
 }

package/registry/extension-registry.js

@@ -5,7 +5,7 @@ import { resolvePromisesDeep } from '../utils/resolve-promises.js';
 import { ExtensionPackage, ExtensionPackageComponent, ExtensionPackageProcessor, } from './extension-package.js';
 export var ExtensionRegistry;
 (function (ExtensionRegistry) {
-    let _resolver = import.meta.resolve;
+    let _parentPath = import.meta.url;
     ExtensionRegistry.packages = new Map();
     ExtensionRegistry.components = new Map();
     ExtensionRegistry.processors = new Map();
@@ -50,12 +50,11 @@ export var ExtensionRegistry;
     ExtensionRegistry.getProcessor = getProcessor;
     /**
      *
-     * @param resolver
      */
-    function setResolver(resolver) {
-        _resolver = resolver;
+    function setParentPath(value) {
+        _parentPath = value;
     }
-    ExtensionRegistry.setResolver = setResolver;
+    ExtensionRegistry.setParentPath = setParentPath;
     /**
      *
      */
@@ -69,7 +68,7 @@ export var ExtensionRegistry;
      *
      */
     async function registerNodePackage(specifier) {
-        const pkg = await ExtensionPackage.fromNodePackage(specifier, _resolver);
+        const pkg = await ExtensionPackage.fromNodePackage(specifier, _parentPath);
         storePackage(pkg);
         return pkg;
     }

package/registry/registry.js

@@ -1,273 +0,0 @@
-"use strict";
-// import * as fs from 'node:fs';
-// import path from 'node:path';
-// import process from 'node:process';
-// import { fileURLToPath, pathToFileURL } from 'node:url';
-// import { deepClone, isPlainObject } from '@jsopen/objects';
-// import { Type } from 'ts-gems';
-// import type { ComponentBase } from '../classes/component-base.js';
-// import type { ProcessorBase } from '../classes/processor-base.js';
-// import { COMPONENT_OPTIONS, PROCESSOR_OPTIONS } from '../constants.js';
-// import { ComponentMetadata, ProcessorMetadata } from '../models/index.js';
-// import { isExtensionPackage } from '../utils/make-extension-package.js';
-//
-// export namespace ExtensionRegistry {
-//   let _resolver = import.meta.resolve;
-//
-//   export const packages = new Map<
-//     string,
-//     ExtensionRegistry.ExtensionPackageRecord
-//   >();
-//   export const components = new Map<
-//     string,
-//     ExtensionRegistry.ComponentRecord
-//   >();
-//   export const processors = new Map<
-//     string,
-//     ExtensionRegistry.ProcessorRecord
-//   >();
-//
-//   export function setResolver(resolver: (name: string) => string) {
-//     _resolver = resolver;
-//   }
-//
-//   export function getProcessor(
-//     className: string,
-//   ): ExtensionRegistry.ProcessorRecord {
-//     const rec = ExtensionRegistry.processors.get(className);
-//     if (!rec) {
-//       throw new Error(`Processor "${className}" not found in registry`);
-//     }
-//     return rec;
-//   }
-//
-//   export function getComponent(
-//     className: string,
-//   ): ExtensionRegistry.ComponentRecord {
-//     const rec = ExtensionRegistry.components.get(className);
-//     if (!rec) {
-//       throw new Error(`Component "${className}" not found in registry`);
-//     }
-//     return rec;
-//   }
-//
-//   export async function registerPackage(
-//     ...specifiers: string[]
-//   ): Promise<void> {
-//     const errors: string[] = [];
-//     await Promise.all(
-//       specifiers.map(specifier =>
-//         _registerPackage(specifier).catch(err => {
-//           errors.push(`\n    ${specifier}: ${err.message}`);
-//         }),
-//       ),
-//     );
-//     if (errors.length) {
-//       console.error(`Failed to register extensions:${errors}`);
-//     }
-//   }
-//
-//   async function _registerPackage(
-//     specifier: string,
-//     options?: {
-//       ignoreInvalid?: boolean;
-//     },
-//   ): Promise<void> {
-//     let packagePath = fileURLToPath(_resolver(specifier));
-//     const json = locatePkgJson(path.dirname(packagePath));
-//     if (!json) {
-//       if (options?.ignoreInvalid) return;
-//       throw new TypeError(`Can't locate package.json file for "${specifier}"`);
-//     }
-//
-//     if (path.isAbsolute(packagePath) && process.platform === 'win32') {
-//       packagePath = pathToFileURL(packagePath).href;
-//     }
-//
-//     const pkg = (await import(packagePath)).default;
-//     if (!isExtensionPackage(pkg)) {
-//       if (options?.ignoreInvalid) return;
-//       throw new TypeError(
-//         `"${specifier}" do not export ExtensionPackage interface`,
-//       );
-//     }
-//     // ignore if already registered
-//     if (packages.get(json.name)) return;
-//
-//     // Register dependencies
-//     if (pkg.dependencies) {
-//       for (const dep of pkg.dependencies)
-//         await _registerPackage(dep, { ignoreInvalid: true });
-//     }
-//
-//     const packageRec: ExtensionRegistry.ExtensionPackageRecord = Object.freeze({
-//       name: json.name,
-//       version: json.version,
-//       description: json.description,
-//     });
-//     packages.set(packageRec.name, packageRec);
-//
-//     if (Array.isArray(pkg.components)) {
-//       for (const ctor of pkg.components) {
-//         await registerComponent(ctor, packageRec.name);
-//       }
-//     }
-//
-//     if (Array.isArray(pkg.processors)) {
-//       for (const ctor of pkg.processors) {
-//         await registerProcessor(ctor, packageRec.name);
-//       }
-//     }
-//   }
-//
-//   export async function registerComponent(ctor: Type, packageName: string) {
-//     const _metadata: ComponentMetadata = Reflect.getMetadata(
-//       COMPONENT_OPTIONS,
-//       ctor,
-//     );
-//     if (!_metadata)
-//       throw new TypeError(`Class "${ctor.name}" has no component metadata.`);
-//     if (_metadata.abstract) return;
-//     let componentRec = components.get(_metadata.className);
-//     if (componentRec)
-//       throw new TypeError(
-//         `Component "${_metadata.className}" already registered by "${componentRec.package}" package`,
-//       );
-//
-//     let metadata: ComponentMetadata = await resolvePromisesDeep(_metadata);
-//     metadata = deepClone({
-//       className: metadata.className,
-//       displayName: metadata.displayName,
-//       description: metadata.description,
-//       iconUrl: metadata.iconUrl,
-//       author: metadata.author,
-//       interfaces: metadata.interfaces,
-//       tags: metadata.tags,
-//       abstract: metadata.abstract,
-//       variables: metadata.variables,
-//       components: metadata.components,
-//       ...(metadata as any),
-//     });
-//     if (metadata.variables) {
-//       /** Convert object enumValues to arrays */
-//       for (const v of Object.values(metadata.variables)) {
-//         if (
-//           v.enumValues &&
-//           typeof v.enumValues === 'object' &&
-//           !Array.isArray(v.enumValues)
-//         ) {
-//           let values: any = v.enumValues;
-//           const keys = Object.keys(values).filter(k => !/^\d+$/.test(k));
-//           values = keys.reduce((a, k) => {
-//             if (values[k] != null) a.push(values[k]);
-//             return a;
-//             // v => !(typeof v === 'number' && !keys.includes(String(v))),
-//           }, [] as any[]);
-//           v.enumValues = values;
-//         }
-//       }
-//     }
-//
-//     componentRec = {
-//       package: packageName,
-//       ctor,
-//       metadata,
-//     };
-//     components.set(metadata.className, componentRec);
-//   }
-//
-//   export async function registerProcessor(ctor: Type, packageName: string) {
-//     const _metadata: ProcessorMetadata = Reflect.getMetadata(
-//       PROCESSOR_OPTIONS,
-//       ctor,
-//     );
-//     if (!_metadata)
-//       throw new TypeError(`Class "${ctor.name}" has no processor metadata.`);
-//     if (_metadata.abstract) return;
-//     let processorRec = processors.get(_metadata.className);
-//     if (processorRec)
-//       throw new TypeError(
-//         `Processor "${_metadata.className}" already registered by "${processorRec.package}" package`,
-//       );
-//     let metadata: ComponentMetadata = await resolvePromisesDeep(_metadata);
-//     metadata = deepClone({
-//       className: metadata.className,
-//       displayName: metadata.displayName,
-//       description: metadata.description,
-//       iconUrl: metadata.iconUrl,
-//       author: metadata.author,
-//       tags: metadata.tags,
-//       abstract: metadata.abstract,
-//       variables: metadata.variables,
-//       components: metadata.components,
-//       ...(metadata as any),
-//     });
-//     if (metadata.variables) {
-//       /** Convert object enumValues to arrays */
-//       for (const v of Object.values(metadata.variables)) {
-//         if (
-//           v.enumValues &&
-//           typeof v.enumValues === 'object' &&
-//           !Array.isArray(v.enumValues)
-//         ) {
-//           let values: any = v.enumValues;
-//           const keys = Object.keys(values).filter(k => !/^\d+$/.test(k));
-//           values = keys.reduce((a, k) => {
-//             if (values[k] != null) a.push(values[k]);
-//             return a;
-//             // v => !(typeof v === 'number' && !keys.includes(String(v))),
-//           }, [] as any[]);
-//           v.enumValues = values;
-//         }
-//       }
-//     }
-//     processorRec = {
-//       package: packageName,
-//       ctor,
-//       metadata,
-//     };
-//     processors.set(metadata.className, processorRec);
-//   }
-// }
-//
-// function locatePkgJson(directory: string): Record<string, any> | undefined {
-//   if (directory.startsWith('file:')) directory = fileURLToPath(directory);
-//   for (let i = 0; i < 3; i++) {
-//     const f = path.resolve(directory, 'package.json');
-//     if (fs.existsSync(f)) {
-//       const json = JSON.parse(fs.readFileSync(f, 'utf8'));
-//       if (json.name && json.version) return json;
-//     }
-//     directory = path.dirname(directory);
-//   }
-// }
-//
-// async function resolvePromisesDeep(obj: any) {
-//   obj = await obj;
-//   if (obj && isPlainObject(obj)) {
-//     for (const k of Object.keys(obj)) {
-//       obj[k] = await resolvePromisesDeep(obj[k]);
-//     }
-//   }
-//   return obj;
-// }
-//
-// export namespace ExtensionRegistry {
-//   export interface ExtensionPackageRecord {
-//     name: string;
-//     description?: string;
-//     version: string;
-//   }
-//
-//   export interface ComponentRecord {
-//     package: string;
-//     ctor: Type<ComponentBase>;
-//     metadata: ComponentMetadata;
-//   }
-//
-//   export interface ProcessorRecord {
-//     package: string;
-//     ctor: Type<ProcessorBase>;
-//     metadata: ProcessorMetadata;
-//   }
-// }