@travetto/model 5.0.0-rc.1 → 5.0.0-rc.3

package/README.md

@@ -235,7 +235,7 @@ In addition to the provided contracts, the module also provides common utilities
 ```typescript
 import { Readable } from 'node:stream';
 import { buffer as toBuffer } from 'node:stream/consumers';
-import { Class, TimeSpan } from '@travetto/base';
+import { Class, TimeSpan } from '@travetto/runtime';
 import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.3",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,14 +26,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^5.0.0-rc.1",
-    "@travetto/di": "^5.0.0-rc.0",
-    "@travetto/registry": "^5.0.0-rc.1",
-    "@travetto/schema": "^5.0.0-rc.0"
+    "@travetto/config": "^5.0.0-rc.3",
+    "@travetto/di": "^5.0.0-rc.3",
+    "@travetto/registry": "^5.0.0-rc.3",
+    "@travetto/schema": "^5.0.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1",
-    "@travetto/test": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.3",
+    "@travetto/test": "^5.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/error/exists.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a data item already exists

package/src/error/invalid-index.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 import { IndexConfig } from '../registry/types';
 import { ModelType } from '../types/model';

package/src/error/invalid-sub-type.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a model subtype class is unable to be used directly

package/src/error/not-found.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 
 /**
  * Represents when a model of cls and id cannot be found

package/src/internal/service/bulk.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { BulkOp } from '../../service/bulk';
 import { ModelType } from '../../types/model';

package/src/internal/service/crud.ts

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 
-import { Class, Util } from '@travetto/base';
+import { Class, Util } from '@travetto/runtime';
 import { DataUtil, SchemaRegistry, SchemaValidator, ValidationError, ValidationResultError } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';

package/src/internal/service/expiry.ts

@@ -1,4 +1,4 @@
-import { ShutdownManager, Class, TimeSpan, TimeUtil, Util } from '@travetto/base';
+import { ShutdownManager, Class, TimeSpan, TimeUtil, Util } from '@travetto/runtime';
 
 import { ModelRegistry } from '../../registry/model';
 import { ModelExpirySupport } from '../../service/expiry';

package/src/internal/service/indexed.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { DeepPartial } from '@travetto/schema';
 
 import { IndexNotSupported } from '../../error/invalid-index';

package/src/internal/service/storage.ts

@@ -1,4 +1,4 @@
-import { Class, Env } from '@travetto/base';
+import { Class, Runtime } from '@travetto/runtime';
 import { SchemaChangeListener } from '@travetto/schema';
 
 import { ModelRegistry } from '../../registry/model';
@@ -13,7 +13,7 @@ export class ModelStorageUtil {
    * Register change listener on startup
    */
   static async registerModelChangeListener(storage: ModelStorageSupport, target?: Class): Promise<void> {
-    if (!Env.dynamic || !(storage?.config?.autoCreate ?? !Env.production)) {
+    if (!Runtime.dynamic || !(storage?.config?.autoCreate ?? !Runtime.production)) {
       return;
     }
 

package/src/internal/service/stream.ts

@@ -1,4 +1,4 @@
-import { AppError, Class } from '@travetto/base';
+import { AppError, Class } from '@travetto/runtime';
 
 import { ModelType } from '../../types/model';
 import { StreamRange } from '../../service/stream';

package/src/provider/file.ts

@@ -5,7 +5,7 @@ import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import path from 'node:path';
 
-import { Class, TimeSpan, RuntimeContext } from '@travetto/base';
+import { Class, TimeSpan, Runtime } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { Required } from '@travetto/schema';
@@ -36,7 +36,7 @@ export class FileModelConfig {
   cullRate?: number | TimeSpan;
 
   async postConstruct(): Promise<void> {
-    this.folder ??= path.resolve(os.tmpdir(), `trv_file_${RuntimeContext.main.name.replace(/[^a-z]/ig, '_')}`);
+    this.folder ??= path.resolve(os.tmpdir(), `trv_file_${Runtime.main.name.replace(/[^a-z]/ig, '_')}`);
   }
 }
 

package/src/provider/memory.ts

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { buffer as toBuffer } from 'node:stream/consumers';
 
-import { Class, TimeSpan } from '@travetto/base';
+import { Class, TimeSpan } from '@travetto/runtime';
 import { DeepPartial } from '@travetto/schema';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';

package/src/registry/decorator.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { SchemaRegistry } from '@travetto/schema';
 
 import { ModelType } from '../types/model';

package/src/registry/model.ts

@@ -1,8 +1,7 @@
-import { RuntimeIndex } from '@travetto/manifest';
 import { SchemaRegistry } from '@travetto/schema';
 import { MetadataRegistry } from '@travetto/registry';
 import { DependencyRegistry } from '@travetto/di';
-import { AppError, Class } from '@travetto/base';
+import { AppError, Class, describeFunction } from '@travetto/runtime';
 import { AllViewⲐ } from '@travetto/schema/src/internal/types';
 
 import { IndexConfig, IndexType, ModelOptions } from './types';
@@ -52,7 +51,14 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   }
 
   createPending(cls: Class): Partial<ModelOptions<ModelType>> {
-    return { class: cls, indices: [], autoCreate: true, baseType: RuntimeIndex.getFunctionMetadata(cls)?.abstract, postLoad: [], prePersist: [] };
+    return {
+      class: cls,
+      indices: [],
+      autoCreate: true,
+      baseType: describeFunction(cls).abstract,
+      postLoad: [],
+      prePersist: []
+    };
   }
 
   registerDataHandlers(cls: Class, pConfig?: Partial<ModelOptions<ModelType>>): void {

package/src/registry/types.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { Primitive } from '@travetto/schema';
 
 import { ModelType } from '../types/model';

package/src/service/basic.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { ModelType, OptionalId } from '../types/model';
 
 /**

package/src/service/bulk.ts

@@ -1,4 +1,4 @@
-import { Class, AppError } from '@travetto/base';
+import { Class, AppError } from '@travetto/runtime';
 import { ValidationResultError } from '@travetto/schema';
 
 import { ModelCrudSupport } from './crud';

package/src/service/crud.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { ModelType, OptionalId, ModelIdSource } from '../types/model';
 

package/src/service/expiry.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { ModelType } from '../types/model';
 import { ModelCrudSupport } from './crud';

package/src/service/indexed.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { DeepPartial } from '@travetto/schema';
 
 import { ModelType, OptionalId } from '../types/model';

package/src/service/storage.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { SchemaChange } from '@travetto/schema';
 
 import { ModelType } from '../types/model';

package/support/base-command.ts

@@ -1,4 +1,4 @@
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliValidationError, CliCommandShape, cliTpl } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 

package/support/bin/candidate.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { ModelRegistry } from '@travetto/model/src/registry/model';
 import { InjectableConfig, DependencyRegistry } from '@travetto/di';
 import { ModelStorageSupportTarget } from '@travetto/model/src/internal/service/common';

package/support/bin/export.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import type { Class } from '@travetto/runtime';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
 import type { ModelType } from '@travetto/model/src/types/model';
 

package/support/bin/install.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import type { Class } from '@travetto/runtime';
 import type { ModelStorageSupport } from '@travetto/model/src/service/storage';
 import type { ModelType } from '@travetto/model/src/types/model';
 

package/support/doc.support.tsx

@@ -1,9 +1,9 @@
 /** @jsxImportSource @travetto/doc */
 import { readFileSync } from 'node:fs';
 
-import { RuntimeIndex } from '@travetto/manifest';
 import { d, c, DocJSXElementByFn, DocJSXElement } from '@travetto/doc';
 import { Config } from '@travetto/config';
+import { Runtime } from '@travetto/runtime';
 
 export const Links = {
   Basic: d.codeLink('Basic', '@travetto/model/src/service/basic.ts', /export interface/),
@@ -16,7 +16,7 @@ export const Links = {
 
 export const ModelTypes = (file: string | Function): DocJSXElement[] => {
   if (typeof file !== 'string') {
-    file = RuntimeIndex.getFunctionMetadata(file)!.source;
+    file = Runtime.getSource(file);
   }
   const contents = readFileSync(file, 'utf8');
   const found: DocJSXElementByFn<'CodeLink'>[] = [];

package/support/test/base.ts

@@ -1,5 +1,5 @@
 import { DependencyRegistry } from '@travetto/di';
-import { AppError, Class } from '@travetto/base';
+import { AppError, Class } from '@travetto/runtime';
 
 import { isBulkSupported, isCrudSupported } from '../../src/internal/service/common';
 import { ModelType } from '../../src/types/model';

package/support/test/expiry.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
-import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/base';
+import { TimeSpan, TimeUnit, TimeUtil } from '@travetto/runtime';
 
 import { ExpiresAt, Model } from '../../src/registry/decorator';
 import { ModelExpirySupport } from '../../src/service/expiry';

package/support/test/indexed.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema } from '@travetto/schema';
-import { TimeUtil } from '@travetto/base';
+import { TimeUtil } from '@travetto/runtime';
 
 import { Index, Model } from '../../src/registry/decorator';
 import { ModelIndexedSupport } from '../../src/service/indexed';

package/support/test/suite.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { DependencyRegistry } from '@travetto/di';
 import { RootRegistry } from '@travetto/registry';
 import { SuiteRegistry, TestFixtures } from '@travetto/test';