@travetto/model 5.0.0-rc.2 → 5.0.0-rc.4

package/package.json

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

package/src/internal/service/indexed.ts

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

package/src/internal/service/storage.ts

@@ -20,7 +20,6 @@ export class ModelStorageUtil {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     target = target ?? storage.constructor as Class<ModelStorageSupport>;
 
-
     const checkType = (cls: Class, enforceBase = true): boolean => {
       if (enforceBase && ModelRegistry.getBaseModel(cls) !== cls) {
         return false;

package/src/provider/memory.ts

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

package/src/registry/decorator.ts

@@ -24,9 +24,8 @@ export function Model(conf: Partial<ModelOptions<ModelType>> | string = {}) {
 /**
  * Defines an index on a model
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function Index<T>(...indices: IndexConfig<any>[]) {
-  return function (target: Class<T>): void {
+export function Index<T extends ModelType>(...indices: IndexConfig<T>[]) {
+  return function (target: Class<T>) {
     ModelRegistry.getOrCreatePending(target).indices!.push(...indices);
   };
 }

package/src/registry/types.ts

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

package/src/service/indexed.ts

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

package/support/cli.model_export.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Exports model schemas
  */
-@CliCommand({ addEnv: true, addModule: true })
+@CliCommand({ with: { env: true, module: true } })
 export class ModelExportCommand extends BaseModelCommand {
 
   getOp(): 'exportModel' { return 'exportModel'; }

package/support/cli.model_install.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Installing models
  */
-@CliCommand({ addEnv: true, addModule: true })
+@CliCommand({ with: { env: true, module: true } })
 export class ModelInstallCommand extends BaseModelCommand {
 
   getOp(): 'createModel' { return 'createModel'; }

package/support/doc.support.tsx

@@ -1,9 +1,6 @@
 /** @jsxImportSource @travetto/doc */
-import { readFileSync } from 'node:fs';
-
-import { d, c, DocJSXElementByFn, DocJSXElement } from '@travetto/doc';
+import { d, c, DocJSXElementByFn, DocJSXElement, DocFileUtil } 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/),
@@ -14,14 +11,11 @@ export const Links = {
   Stream: d.codeLink('Streaming', '@travetto/model/src/service/stream.ts', /export interface/),
 };
 
-export const ModelTypes = (file: string | Function): DocJSXElement[] => {
-  if (typeof file !== 'string') {
-    file = Runtime.getSource(file);
-  }
-  const contents = readFileSync(file, 'utf8');
+export const ModelTypes = (fn: | Function): DocJSXElement[] => {
+  const { content } = DocFileUtil.readSource(fn);
   const found: DocJSXElementByFn<'CodeLink'>[] = [];
   const seen = new Set();
-  for (const [, key] of contents.matchAll(/Model(Crud|Expiry|Indexed|Bulk|Stream)Support/g)) {
+  for (const [, key] of content.matchAll(/Model(Crud|Expiry|Indexed|Bulk|Stream)Support/g)) {
     if (!seen.has(key)) {
       seen.add(key);
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions

package/support/test/crud.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert';
+import timers from 'node:timers/promises';
 
 import { Suite, Test } from '@travetto/test';
 import { Schema, Text, Precision, Required, } from '@travetto/schema';
@@ -224,7 +225,7 @@ export abstract class ModelCrudSuite extends BaseModelSuite<ModelCrudSupport> {
     assert(res.createdDate instanceof Date);
     assert(res.updatedDate instanceof Date);
 
-    await new Promise(r => setTimeout(r, 100));
+    await timers.setTimeout(100);
 
     const final = await service.updatePartial(Dated, { id: res.id });
     assert(final.createdDate instanceof Date);