@lorion-org/descriptor-discovery 1.0.0-beta.2 → 1.0.0-beta.3

package/README.md

@@ -44,7 +44,7 @@ layer-extensions/
 import { discoverDescriptors } from '@lorion-org/descriptor-discovery';
 
 const discovered = discoverDescriptors({
-  cwd: './playground',
+  cwd: '.',
   descriptorPaths: ['layer-extensions/*/extension.json'],
 });
 
@@ -61,7 +61,7 @@ id when the descriptor does not define one.
 import { discoverDescriptors } from '@lorion-org/descriptor-discovery';
 
 const discovered = discoverDescriptors({
-  cwd: './playground',
+  cwd: '.',
   descriptorPaths: ['layer-extensions/*/extension.json'],
   nestedField: 'bundles',
 });
@@ -79,7 +79,7 @@ import { createDescriptorCatalog } from '@lorion-org/composition-graph';
 import { discoverDescriptors } from '@lorion-org/descriptor-discovery';
 
 const discovered = discoverDescriptors({
-  cwd: './playground',
+  cwd: '.',
   descriptorPaths: ['layer-extensions/*/extension.json'],
   nestedField: 'bundles',
 });

package/dist/index.cjs

@@ -32,7 +32,8 @@ var index_exports = {};
 __export(index_exports, {
   descriptorSchema: () => descriptorSchema,
   discoverDescriptors: () => discoverDescriptors,
-  expandNestedDescriptors: () => expandNestedDescriptors
+  expandNestedDescriptors: () => expandNestedDescriptors,
+  requirePackageName: () => requirePackageName
 });
 module.exports = __toCommonJS(index_exports);
 var import_node_fs = require("fs");
@@ -112,6 +113,12 @@ var descriptor_schema_default = {
 var descriptorSchema = descriptor_schema_default;
 
 // src/index.ts
+function requirePackageName(packageJson, packageJsonPath) {
+  if (typeof packageJson.name !== "string") {
+    throw new Error(`Capability package is missing "name": ${packageJsonPath}`);
+  }
+  return packageJson.name;
+}
 function formatDescriptorSchemaValidationError(target, validationError) {
   const jsonPath = validationError.instancePath || "/";
   const ajvError = `${validationError.keyword}${validationError.message ? `: ${validationError.message}` : ""}`;
@@ -320,5 +327,6 @@ function discoverDescriptors(input) {
 0 && (module.exports = {
   descriptorSchema,
   discoverDescriptors,
-  expandNestedDescriptors
+  expandNestedDescriptors,
+  requirePackageName
 });

package/dist/index.d.cts

@@ -2,6 +2,9 @@ import { ErrorObject, Options } from 'ajv';
 import { Descriptor } from '@lorion-org/composition-graph';
 export { JsonSchemaObject, descriptorSchema } from './schema.cjs';
 
+declare function requirePackageName(packageJson: {
+    name?: unknown;
+}, packageJsonPath: string): string;
 type RawDescriptor = Omit<Descriptor, 'id'> & {
     id?: string;
 };
@@ -39,4 +42,4 @@ type DiscoverDescriptorsInput = {
 declare function expandNestedDescriptors(input: ExpandNestedDescriptorsInput): Descriptor[];
 declare function discoverDescriptors(input: DiscoverDescriptorsInput): DiscoveredDescriptor[];
 
-export { type DescriptorSchemaValidationErrorFormatter, type DescriptorSchemaValidationTarget, type DescriptorValidationOptions, type DiscoverDescriptorsInput, type DiscoveredDescriptor, type ExpandNestedDescriptorsInput, type RawDescriptor, discoverDescriptors, expandNestedDescriptors };
+export { type DescriptorSchemaValidationErrorFormatter, type DescriptorSchemaValidationTarget, type DescriptorValidationOptions, type DiscoverDescriptorsInput, type DiscoveredDescriptor, type ExpandNestedDescriptorsInput, type RawDescriptor, discoverDescriptors, expandNestedDescriptors, requirePackageName };

package/dist/index.d.ts

@@ -2,6 +2,9 @@ import { ErrorObject, Options } from 'ajv';
 import { Descriptor } from '@lorion-org/composition-graph';
 export { JsonSchemaObject, descriptorSchema } from './schema.js';
 
+declare function requirePackageName(packageJson: {
+    name?: unknown;
+}, packageJsonPath: string): string;
 type RawDescriptor = Omit<Descriptor, 'id'> & {
     id?: string;
 };
@@ -39,4 +42,4 @@ type DiscoverDescriptorsInput = {
 declare function expandNestedDescriptors(input: ExpandNestedDescriptorsInput): Descriptor[];
 declare function discoverDescriptors(input: DiscoverDescriptorsInput): DiscoveredDescriptor[];
 
-export { type DescriptorSchemaValidationErrorFormatter, type DescriptorSchemaValidationTarget, type DescriptorValidationOptions, type DiscoverDescriptorsInput, type DiscoveredDescriptor, type ExpandNestedDescriptorsInput, type RawDescriptor, discoverDescriptors, expandNestedDescriptors };
+export { type DescriptorSchemaValidationErrorFormatter, type DescriptorSchemaValidationTarget, type DescriptorValidationOptions, type DiscoverDescriptorsInput, type DiscoveredDescriptor, type ExpandNestedDescriptorsInput, type RawDescriptor, discoverDescriptors, expandNestedDescriptors, requirePackageName };

package/dist/index.js

@@ -6,6 +6,12 @@ import {
 import { existsSync, readFileSync, readdirSync } from "fs";
 import { basename, dirname, join, resolve as resolvePath } from "path";
 import Ajv from "ajv";
+function requirePackageName(packageJson, packageJsonPath) {
+  if (typeof packageJson.name !== "string") {
+    throw new Error(`Capability package is missing "name": ${packageJsonPath}`);
+  }
+  return packageJson.name;
+}
 function formatDescriptorSchemaValidationError(target, validationError) {
   const jsonPath = validationError.instancePath || "/";
   const ajvError = `${validationError.keyword}${validationError.message ? `: ${validationError.message}` : ""}`;
@@ -213,5 +219,6 @@ function discoverDescriptors(input) {
 export {
   descriptorSchema,
   discoverDescriptors,
-  expandNestedDescriptors
+  expandNestedDescriptors,
+  requirePackageName
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lorion-org/descriptor-discovery",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Node-based descriptor discovery and normalization helpers.",
   "license": "MIT",
   "repository": {

package/src/index.ts

@@ -6,6 +6,20 @@ import type { Descriptor } from '@lorion-org/composition-graph';
 
 export { descriptorSchema, type JsonSchemaObject } from './schema';
 
+// A capability lives on disk as a package: its descriptor (capability.json) beside
+// a package.json. Validating that the package declares a `name` — with one shared
+// error message — belongs here next to descriptor discovery, so each host does not
+// reimplement it. Takes an already-parsed package.json to avoid re-reading it.
+export function requirePackageName(
+  packageJson: { name?: unknown },
+  packageJsonPath: string,
+): string {
+  if (typeof packageJson.name !== 'string') {
+    throw new Error(`Capability package is missing "name": ${packageJsonPath}`);
+  }
+  return packageJson.name;
+}
+
 export type RawDescriptor = Omit<Descriptor, 'id'> & {
   id?: string;
 };