@fougere/schema 0.17.3-alpha.0 → 0.18.0-alpha.0

package/src/projection/card/SchemaDescriptor.ts

@@ -1,12 +1,11 @@
 import type { FieldDescriptor } from './FieldDescriptor.js';
 import type { DerivedFrom } from './DerivedFrom.js';
+import type { Envelope } from './Envelope.js';
 
-export interface SchemaDescriptor {
+export interface SchemaDescriptor extends Envelope {
   title?: string;
   type: 'object';
   properties: Record<string, FieldDescriptor>;
   required?: string[];
   'x-fougere-derived'?: DerivedFrom;
-  'x-fougere-version': 1;
-  'x-fougere-vendor': 'fougere';
 }

package/src/vocabulary/primitive/json.ts

@@ -1,12 +1,12 @@
 import { Field, type Shared } from '../../field/Field.js';
 import type { SchemaView } from '../../SchemaView.js';
+import type { Entity } from '../../entity/Entity.js';
 import { InputValidator } from '../../validator/InputValidator.js';
 import { SchemaError } from '../../SchemaError.js';
 
-type Entity = SchemaView & (new (...args: never[]) => unknown);
 
 export function json<T = unknown>(opts?: Shared<T>): Field<T>;
-export function json<E extends SchemaView & (new (...args: any[]) => any)>(
+export function json<E extends Entity>(
   of: E,
   opts?: Shared<InstanceType<E>>,
 ): Field<InstanceType<E>>;

package/src/vocabulary/primitive/many.ts

@@ -1,11 +1,11 @@
-import { type EntityConstructor } from '../../axis/role/EntityConstructor.js';
+import type { Entity } from '../../entity/Entity.js';
 import { Relation } from '../../axis/role/Relation.js';
 import { Field, type Described } from '../../field/Field.js';
 
 /**
  * `many(() => Post)` → `{ type: 'array' }` with `role.relation.kind` `'many'`
  */
-export function many<E extends EntityConstructor>(
+export function many<E extends Entity>(
   target: E | (() => E),
   opts?: Described,
 ): Field<InstanceType<E>[]> {

package/src/vocabulary/primitive/ref.ts

@@ -1,4 +1,4 @@
-import { type EntityConstructor } from '../../axis/role/EntityConstructor.js';
+import type { Entity } from '../../entity/Entity.js';
 import { Relation, type OnDelete } from '../../axis/role/Relation.js';
 import { Field, type Shared } from '../../field/Field.js';
 
@@ -6,7 +6,7 @@ export interface RefOptions extends Shared<string> {
   onDelete?: OnDelete;
 }
 
-export function ref<E extends EntityConstructor>(
+export function ref<E extends Entity>(
   target: E | (() => E),
   opts?: RefOptions,
 ): Field<string> {

package/dist/axis/role/EntityConstructor.d.ts

@@ -1,2 +0,0 @@
-export type EntityConstructor = abstract new (...args: any[]) => any;
-//# sourceMappingURL=EntityConstructor.d.ts.map

package/dist/axis/role/EntityConstructor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntityConstructor.d.ts","sourceRoot":"","sources":["../../../src/axis/role/EntityConstructor.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC"}

package/dist/axis/role/EntityConstructor.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=EntityConstructor.js.map

package/dist/axis/role/EntityConstructor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntityConstructor.js","sourceRoot":"","sources":["../../../src/axis/role/EntityConstructor.ts"],"names":[],"mappings":""}

package/src/axis/role/EntityConstructor.ts

@@ -1 +0,0 @@
-export type EntityConstructor = abstract new (...args: any[]) => any;