@node-in-layers/data 1.0.4 → 1.0.6

package/README.md

@@ -1,6 +1,6 @@
 # Data - A Node In Layers Package used for handling data and databases.
 
-This repository focuses on accessing and manipulating data, especially the ability to easily communicate with different databases. This package provides a high level interface for working with databases via the [functional-models](https://github.com/monolithst/functional-models) framework, particularly the [functional-models-orm](https://github.com/monolithst/functional-models-orm) functional object relational mapper (ORM) framework. It also provides access to the lower level database objects, for optimized direct querying.
+This repository focuses on accessing and manipulating data, especially the ability to easily communicate with different databases. This package provides the "getModelProps" interface, for `@node-in-layers/core` so that Models can be backed with an ORM.
 
 # How To Install
 
@@ -8,23 +8,27 @@ This repository focuses on accessing and manipulating data, especially the abili
 
 ## Supported Databases
 
-- dynamo
-- memory
-- mongo
-- mysql
-- opensearch
-- postgres
-- sqlite
+- Mongo - [functional-models-orm-mongo](https://github.com/monolithst/functional-models-orm-mongo)
+- MySql - [functional-models-orm-sql](https://github.com/monolithst/functional-models-orm-sql)
+- ElasticSearch / OpenSearch - [functional-models-orm-elastic](https://github.com/monolithst/functional-models-orm-elastic)
+- Postgresql - [functional-models-orm-sql](https://github.com/monolithst/functional-models-orm-sql)
+- Sqlite - [functional-models-orm-sql](https://github.com/monolithst/functional-models-orm-sql)
+- AWS Dynamo DB - [functional-models-orm-dynamo](https://github.com/monolithst/functional-models-orm-dynamo)
+- In-Memory - [functional-models-orm-memory](https://github.com/monolithst/functional-models-orm-memory)
 
 ## How To Add To a Node In Layers System
 
 To use this package you must do the following:
 
-1. Add it to the `apps` property.
+1. Add this package to the `apps` property.
+1. Add `modelFactory: "@node-in-layers/data"` to the core configuration.
 1. Add a `@node-in-layers/data` section to your configuration file.
+1. Optional/Recommended: Add `modelCruds:true` to the core configuration.
 
 We recommend that you put the `data` app, as one of the earliest apps, it does not have any requirements, and subsequent packages likely want to use it.
 
+We recommend that you put the `models` layer
+
 #### Example inside a `config.dev.mjs` file:
 
 ```javascript
@@ -40,6 +44,10 @@ const core = {
   layerOrder: ['services', 'features'],
   logLevel: 'debug',
   logFormat: 'json',
+  // Adds the automatic CRUD wrappers to service and features.
+  modelCruds: true,
+  // Makes the models backed by an orm.
+  modelFactory: '@node-in-layers/data',
 }
 
 const data = {
@@ -60,7 +68,7 @@ export default () => ({
 
 ### Multiple Database Support
 
-This package has support for configuring multiple databases through the config file. There must be a "default" database, and any other database can be named and configured.
+This package has support for configuring multiple databases through the config file. There must be a "default" database, and any other database can be named and configured. For models to be backed by the correct database, "customModelFactory" must be configured to say which models are going to be backed by the non-default database.
 
 In the following example we configure 3 databases. 1 is the default, the 2nd is a database for "caching" and the 3rd is a database that has "legacy data" in it.
 
@@ -77,6 +85,18 @@ const core = {
   layerOrder: ['services', 'features'],
   logLevel: 'debug',
   logFormat: 'json',
+  // Adds the automatic CRUD wrappers to service and features.
+  modelCruds: true,
+  // Makes the models backed by an orm.
+  modelFactory: '@node-in-layers/data',
+  customModelFactory: {
+    myApp: {
+      // Model named "MyModelsPluralName" is backed by the myCacheDb database
+      MyModelsPluralName: ['@node-in-layers/data', 'myCacheDb'],
+      // Model named "AnotherModels" is backed by the database myLegacyData
+      AnotherModels: ['@node-in-layers/data', 'myLegacyData'],
+    },
+  },
 }
 
 const data = {
@@ -107,143 +127,16 @@ export default () => ({
 
 There are 2 recommended uses of this package.
 
-1. The Model Cruds Interface
+1. Through the CRUDS interface provided by `@node-in-layers/core`
 1. Direct database access
 
-### The Model Cruds Interface
-
-The Model Cruds Interface (Create, Retrieve, Update, Delete, Search), is a series of wrappers over the top of the `functional-models-orm` framework, so that seamless integration with models can be used. Instead of having to work with the model instances directly, data can pass in and out of the database without having to know anything about how database interactions work.
-
-This interface can quickly wrap models at the service level, feature level and above, making it very easy to create model based REST APIS.
-
-#### A Quick Note About Designing a System Using Models
-
-It has been our experience that data models can and should be used throughout the system, however, the "orm" part of the models, it is recommended that they only be used at the services layer. The best way to do this, is where you need "non-orm" model use (validation, meta data, etc), we recommend using the ["noop" DatastoreProvider](https://github.com/monolithst/functional-models-orm/blob/master/src/datastore/noop.ts) that is made available with the `functional-models-orm` framework.
-
-In many other systems (such as Python's Django), when a developer uses the orm part of the modeling code (save/create/delete/etc), anywhere in the application, it can make it very difficult to optimize and understand bottlenecks of a system.
-
-<b>Node In Layers was designed from the beginning to fix this problem, by keeping each 'kind of code' in their appropriate layers. Database accessing code should go in services.</b>
-
-Here is how to use the Model Cruds Interface:
-
-```typescript
-import { loadSystem, Config, ServiceContext } from '@node-in-layers/core'
-import { memoizeValue } from '@node-in-layers/core/libs'
-import { DataNamespace, DataServicesLayer } from '@node-in-layers/data'
-import { createSimpleServiceModelWrappers } from '@node-in-layers/data/libs'
-import { OrmModelFactory, ormQueryBuilder } from 'functional-models-orm'
-import { TextProperty, UniqueIdProperty } from 'functional-models'
-import { FeaturesContext } from '@node-in-layers/core/index.js'
-
-type MyCustomModel = Readonly<{
-  id: string
-  name: string
-}>
-
-type AnotherModel = Readonly<{
-  id: string
-  name: string
-}>
-
-const createMyModels = ({ Model }: { Model: OrmModelFactory }) => {
-  const MyCustomModels = Model<MyCustomModel>('MyCustomModels', {
-    properties: {
-      id: UniqueIdProperty({ required: true }),
-      name: TextProperty({ required: true }),
-    },
-  })
-  const AnotherModels = Model<AnotherModel>('AnotherModels', {
-    properties: {
-      id: UniqueIdProperty({ required: true }),
-      name: TextProperty({ required: true }),
-    },
-  })
-  return {
-    MyCustomModels,
-    AnotherModels,
-  }
-}
+### Cruds Interface
 
-// Using this in a service.
-const myService = {
-  // Add DataServices as part of the context.
-  create: (context: ServiceContext<Config, DataServicesLayer>) => {
-    const dataContext = context.services[DataNamespace.root]
-
-    // A helper function so we don't have to get this more than once. We memoize it so its only executed once
-    const _getModels = memoizeValue(async () => {
-      // 1. Create your database instance/s
-      const databases = await dataContext.getDatabases()
-
-      // 2. Create an orm instance with your dbObjects
-      const orm = dataContext.getOrm(databases.default)
-
-      // 3. Create models
-      return createMyModels(orm)
-    })
-
-    // Example: CRUDS as a service - Here is a function makes the models available as service functions.
-    const getModelCruds = async () => {
-      const models = await _getModels()
-      // 4. Create Model Cruds Interface Wrapper.
-      const wrappedMyCustomModels = dataContext.modelCrudsService(
-        models.MyCustomModels
-      )
-      return {
-        [models.MyCustomModels.getName()]: wrappedMyCustomModels,
-      }
-
-      /* An alternative approach is wrapping all of them automagically */
-      return dataContext.modelCrudsServiceWrappers(models)
-    }
-
-    // Example: Using models in a service - Here is another function that uses the models to do a specific kind of search
-    const mySpecialSearch = async (value: string) => {
-      const models = await _getModels()
-      return models.AnotherModels.search(
-        ormQueryBuilder().property('name', value).take(1).compile()
-      ).then(i => i.instances[0])
-    }
-
-    return {
-      getModelCruds,
-      mySpecialSearch,
-    }
-  },
-}
-
-// An Example consumer of the model cruds interface.
-const myFeature = {
-  create: async (context: FeaturesContext<MyConfig>) => {
-    const myComplexFeature = async () => {
-      const myService = context.context['myService']
-      const modelServices = await myService.getModelServices()
-      // Creates and saves.
-      const myModel = await modelServices.MyCustomModels.create({
-        id: 'my-id',
-        name: 'my-custom-name',
-      })
-
-      // Get It back
-      const instance = await modelServices.MyCustomModels.retrieve('my-id')
-
-      // Use another service function that uses models.
-      const value = modelServices.mySpecialSearch(instance.name)
-
-      // Delete it.
-      await modelServices.myCustomModels.delete(instance.id)
-      return 'OK'
-    }
-    return {
-      myComplexFeature,
-    }
-  },
-}
-```
+Look at the `@node-in-layers/core` interface for how to access CRUDS model functions.
 
 ### Direct Database Access
 
-All of the objects that provide database access to `functional-models-orm` is made available in the DatabaseObjects object that comes back from `getDatabases()`. These objects (such as `knexClient`, `opensearchClient`, `mongoClient`, etc) provide the ability to do direct queries on the database using the underlying objects.
+All of the objects that provide database access to orm portion of `functional-models` is made available in the DatabaseObjects object that comes back from `getDatabases()`. These objects (such as `knexClient`, `opensearchClient`, `mongoClient`, etc) provide the ability to do direct queries on the database using the underlying objects.
 
 ### Important SQL Notice
 

package/libs.d.ts

@@ -1,9 +1,9 @@
-import { Model } from 'functional-models/interfaces.js';
+import { ModelType } from 'functional-models';
 declare const getSystemInfrastructureName: ({ environment, systemName, component, }: {
     component?: string | undefined;
     environment: string;
     systemName: string;
 }) => string;
-declare const defaultGetTableNameForModel: (environment: string, systemName: string, model: Model<any> | string) => string;
+declare const defaultGetTableNameForModel: (environment: string, systemName: string, model: ModelType<any> | string) => string;
 declare const getMongoCollectionNameForModel: () => (model: any | string) => string;
 export { getMongoCollectionNameForModel, defaultGetTableNameForModel, getSystemInfrastructureName, };

package/libs.js.map

@@ -1 +1 @@
-{"version":3,"file":"libs.js","sourceRoot":"","sources":["../src/libs.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AAEzC,MAAM,2BAA2B,GAAG,CAAC,EACnC,WAAW,EACX,UAAU,EACV,SAAS,GAKV,EAAE,EAAE;IACH,OAAO,SAAS;QACd,CAAC,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;QACxD,CAAC,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAClC,WAAmB,EACnB,UAAkB,EAClB,KAA0B,EAC1B,EAAE;IACF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;IAC3D,OAAO,2BAA2B,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,8BAA8B,GAAG,GAAG,EAAE,CAAC,CAAC,KAAmB,EAAE,EAAE;IACnE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;AACnC,CAAC,CAAA;AAED,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC3B,2BAA2B,GAC5B,CAAA"}
+{"version":3,"file":"libs.js","sourceRoot":"","sources":["../src/libs.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AAEzC,MAAM,2BAA2B,GAAG,CAAC,EACnC,WAAW,EACX,UAAU,EACV,SAAS,GAKV,EAAE,EAAE;IACH,OAAO,SAAS;QACd,CAAC,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;QACxD,CAAC,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAClC,WAAmB,EACnB,UAAkB,EAClB,KAA8B,EAC9B,EAAE;IACF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;IAC3D,OAAO,2BAA2B,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,8BAA8B,GAAG,GAAG,EAAE,CAAC,CAAC,KAAmB,EAAE,EAAE;IACnE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;AACnC,CAAC,CAAA;AAED,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC3B,2BAA2B,GAC5B,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@node-in-layers/data",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A Node In Layers package used for handling databases.",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,11 @@
     "commit": "cz",
     "dist": "npm run build && cd dist && npm publish",
     "eslint": "eslint .",
-    "feature-tests": "./node_modules/.bin/cucumber-js -p default",
     "prettier": "prettier --write .",
+    "prettier:check": "prettier -c .",
     "test": "export TS_NODE_PROJECT='./tsconfig.test.json' && mocha -r tsx ./test/src/*.test.ts ./test/src/**/*.test.ts ./test/src/**/**/*.test.ts",
-    "test:coverage": "nyc --all --reporter cobertura --reporter text --reporter lcov --reporter html npm run test"
+    "test:coverage": "nyc --all --reporter cobertura --reporter text --reporter lcov --reporter html npm run test",
+    "test:features": "./node_modules/.bin/cucumber-js -p default"
   },
   "config": {
     "commitizen": {
@@ -64,14 +65,14 @@
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.721.0",
     "@aws-sdk/lib-dynamodb": "^3.721.0",
-    "@node-in-layers/core": "^1.1.3",
+    "@node-in-layers/core": "^1.1.6",
     "@opensearch-project/opensearch": "^2.13.0",
-    "functional-models": "^2.1.14",
-    "functional-models-orm": "^2.1.13",
-    "functional-models-orm-dynamo": "^2.1.7",
-    "functional-models-orm-elastic": "^1.0.5",
-    "functional-models-orm-mongo": "^2.0.7",
-    "functional-models-orm-sql": "^2.1.3",
+    "functional-models": "^3.0.12",
+    "functional-models-orm-dynamo": "^3.0.0",
+    "functional-models-orm-elastic": "^3.0.0",
+    "functional-models-orm-memory": "^3.0.0",
+    "functional-models-orm-mongo": "^3.0.0",
+    "functional-models-orm-sql": "^3.0.0",
     "knex": "^3.1.0",
     "lodash": "^4.17.21",
     "modern-async": "^2.0.4",

package/services.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import https from 'node:https';
-import { memoizeValue } from '@node-in-layers/core/utils.js';
-import { orm, } from 'functional-models-orm';
+import { memoizeValueSync } from '@node-in-layers/core/utils.js';
+import { createOrm, } from 'functional-models';
 import { asyncMap } from 'modern-async';
 import merge from 'lodash/merge.js';
 import get from 'lodash/get.js';
@@ -20,18 +20,18 @@ import { MongoClient } from 'mongodb';
 import knex from 'knex';
 import curry from 'lodash/curry.js';
 import omit from 'lodash/omit.js';
-import { datastoreProvider as dynamoDatastoreProvider } from 'functional-models-orm-dynamo';
-import { datastoreProvider as opensearchDatastoreProvider } from 'functional-models-orm-elastic';
-import { datastoreProvider as mongoDatastoreProvider } from 'functional-models-orm-mongo';
-import { datastoreProvider as sqlDatastoreProvider } from 'functional-models-orm-sql';
-import * as memoryDatastoreProvider from 'functional-models-orm/datastore/memory.js';
+import { datastoreAdapter as dynamoDatastoreAdapter } from 'functional-models-orm-dynamo';
+import { datastoreAdapter as opensearchDatastoreAdapter } from 'functional-models-orm-elastic';
+import { datastoreAdapter as mongoDatastoreAdapter } from 'functional-models-orm-mongo';
+import { datastoreAdapter as sqlDatastoreAdapter } from 'functional-models-orm-sql';
+import { datastoreAdapter as memoryDatastoreAdapter } from 'functional-models-orm-memory';
 import { SupportedDatabase, DataNamespace, } from './types.js';
 import { getSystemInfrastructureName, defaultGetTableNameForModel, getMongoCollectionNameForModel, } from './libs.js';
 const DEFAULT_MONGO_PORT = 27017;
 const createMongoConnectionString = ({ host, port, username, password, }) => {
     return `mongodb://${username ? `${username}:${password}@` : ''}${host}:${port || DEFAULT_MONGO_PORT}`;
 };
-const createMongoDatabaseObjects = ({ environment, systemName, host, port, username, password, getTableNameForModel, }) => __awaiter(void 0, void 0, void 0, function* () {
+const createMongoDatabaseObjects = ({ environment, systemName, host, port, username, password, getTableNameForModel, }) => {
     const database = getSystemInfrastructureName({
         environment,
         systemName,
@@ -43,8 +43,8 @@ const createMongoDatabaseObjects = ({ environment, systemName, host, port, usern
         password,
     });
     const mongoClient = new MongoClient(connectionString);
-    yield mongoClient.connect();
-    const datastoreProvider = mongoDatastoreProvider({
+    mongoClient.connect();
+    const datastoreAdapter = mongoDatastoreAdapter.create({
         mongoClient,
         databaseName: database,
         getCollectionNameForModel: curry(getTableNameForModel || getMongoCollectionNameForModel)(environment, systemName),
@@ -54,15 +54,15 @@ const createMongoDatabaseObjects = ({ environment, systemName, host, port, usern
     };
     return {
         mongoClient,
-        datastoreProvider,
+        datastoreAdapter,
         cleanup,
     };
-});
+};
 const createMemoryDatabaseObjects = () => {
-    const datastoreProvider = memoryDatastoreProvider.default.default({});
+    const datastoreAdapter = memoryDatastoreAdapter.create();
     return {
         cleanup: () => Promise.resolve(),
-        datastoreProvider,
+        datastoreAdapter,
     };
 };
 const createOpensearchDatabaseObjects = ({ environment, systemName, username, password, host, getTableNameForModel, }) => {
@@ -73,7 +73,7 @@ const createOpensearchDatabaseObjects = ({ environment, systemName, username, pa
     return {
         cleanup: () => Promise.resolve(),
         opensearchClient: client,
-        datastoreProvider: opensearchDatastoreProvider.create({
+        datastoreAdapter: opensearchDatastoreAdapter.create({
             client,
             getIndexForModel: curry(getTableNameForModel || defaultGetTableNameForModel)(environment, systemName),
         }),
@@ -96,7 +96,7 @@ const createSqlDatabaseObjects = (props) => {
         ])) });
     // @ts-ignore
     const knexClient = knex(knexConfig);
-    const datastoreProvider = sqlDatastoreProvider({
+    const datastoreAdapter = sqlDatastoreAdapter.create({
         knex: knexClient,
         getTableNameForModel: curry(props.getTableNameForModel || defaultGetTableNameForModel)(props.environment, props.systemName),
         //propertyTypeToParser: sqlParsers.BasicPropertyTypeToParser
@@ -104,7 +104,7 @@ const createSqlDatabaseObjects = (props) => {
     return {
         knexClient,
         cleanup: () => Promise.resolve(),
-        datastoreProvider,
+        datastoreAdapter,
     };
 };
 const createDynamoDatabaseObjects = ({ awsRegion, environment, systemName, httpsAgentConfig, getTableNameForModel, }) => {
@@ -118,18 +118,18 @@ const createDynamoDatabaseObjects = ({ awsRegion, environment, systemName, https
     };
     const dynamoDbClient = new dynamo.DynamoDBClient(awsConfig);
     const aws3 = Object.assign(Object.assign({}, dynamo), libDynamo);
-    const datastoreProvider = dynamoDatastoreProvider({
+    const datastoreAdapter = dynamoDatastoreAdapter.create({
         aws3: Object.assign(Object.assign({}, aws3), { dynamoDbClient }),
         getTableNameForModel: curry(getTableNameForModel || defaultGetTableNameForModel)(environment, systemName),
     });
     return {
         dynamoLibs: aws3,
         dynamoDbClient,
-        datastoreProvider,
+        datastoreAdapter,
         cleanup: () => Promise.resolve(),
     };
 };
-const _supportedToDatastoreProviderFunc = {
+const _supportedToDatastoreAdapterFunc = {
     [SupportedDatabase.memory]: createMemoryDatabaseObjects,
     [SupportedDatabase.dynamo]: createDynamoDatabaseObjects,
     [SupportedDatabase.mongo]: createMongoDatabaseObjects,
@@ -138,88 +138,30 @@ const _supportedToDatastoreProviderFunc = {
     [SupportedDatabase.mysql]: createSqlDatabaseObjects,
     [SupportedDatabase.postgres]: createSqlDatabaseObjects,
 };
-const createModelCrudsService = (model) => {
-    const update = (data) => {
-        return model
-            .create(data)
-            .save()
-            .then(instance => {
-            if (!instance) {
-                throw new Error(`Impossible situation`);
-            }
-            return instance.toObj();
-        });
-    };
-    const create = update;
-    const del = (id) => __awaiter(void 0, void 0, void 0, function* () {
-        const instance = yield model.retrieve(id);
-        if (!instance) {
-            return undefined;
-        }
-        yield instance.delete();
-        return undefined;
-    });
-    const retrieve = (id) => {
-        return model.retrieve(id).then(instance => {
-            if (!instance) {
-                return undefined;
-            }
-            return instance.toObj();
-        });
-    };
-    const search = (ormQuery) => {
-        return model.search(ormQuery).then((result) => __awaiter(void 0, void 0, void 0, function* () {
-            const instances = (yield asyncMap(result.instances, i => i.toObj()));
-            return {
-                instances,
-                page: result.page,
-            };
-        }));
-    };
-    return {
-        getModel: () => model,
-        create,
-        update,
-        delete: del,
-        retrieve,
-        search,
-    };
-};
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const create = (context) => {
     const databases = get(context, 'config.@node-in-layers/data.databases');
     if (!databases) {
         throw new Error(`Must include "${DataNamespace.root}.databases" inside of a config that uses the "${DataNamespace.root}" namespace`);
     }
-    const modelCrudsServices = createModelCrudsService;
-    const modelCrudsServiceWrappers = (models) => {
-        return merge(models.map(m => {
-            return {
-                [m.getName()]: createModelCrudsService(m),
-            };
-        }));
-    };
     const getDatabaseObjects = (props) => {
-        return Promise.resolve().then(() => {
-            const func = _supportedToDatastoreProviderFunc[props.datastoreType];
-            if (!func) {
-                throw new Error(`Unhandled type ${props.datastoreType}`);
-            }
-            return func(props);
-        });
+        const func = _supportedToDatastoreAdapterFunc[props.datastoreType];
+        if (!func) {
+            throw new Error(`Unhandled type ${props.datastoreType}`);
+        }
+        return func(props);
     };
     const getOrm = (props) => {
-        const { Model, fetcher } = orm(props);
+        const { Model, fetcher } = createOrm(props);
         return {
             Model,
             fetcher,
         };
     };
     const cleanup = () => __awaiter(void 0, void 0, void 0, function* () {
-        const databases = yield getDatabases();
-        yield asyncMap(Object.values(databases), d => d.cleanup(), 1);
+        const databases = getDatabases();
+        yield asyncMap(Object.values(databases), (d) => d.cleanup(), 1);
     });
-    const _getDatabases = () => __awaiter(void 0, void 0, void 0, function* () {
+    const _getDatabases = () => {
         const neededProps = {
             environment: context.config.environment,
             systemName: context.config.systemName,
@@ -229,24 +171,34 @@ const create = (context) => {
         const otherProps2 = Object.entries(otherProps).reduce((acc, [x, y]) => {
             return merge(acc, { [x]: merge(y, neededProps) });
         }, {});
-        const defaultDb = yield getDatabaseObjects(defaultDbProps);
-        const otherDatabases = yield Object.entries(otherProps2).reduce((accP, props) => __awaiter(void 0, void 0, void 0, function* () {
-            const acc = yield accP;
-            const dbObjects = yield getDatabaseObjects(props[1]);
+        const defaultDb = getDatabaseObjects(defaultDbProps);
+        const otherDatabases = Object.entries(otherProps2).reduce((acc, props) => {
+            const dbObjects = getDatabaseObjects(props[1]);
             return merge(acc, {
                 [props[0]]: dbObjects,
             });
-        }), Promise.resolve({}));
+        }, {});
         return Object.assign({ default: defaultDb }, otherDatabases);
-    });
-    const getDatabases = () => memoizeValue(_getDatabases)();
+    };
+    const getDatabases = memoizeValueSync(_getDatabases);
+    const getModelProps = (context, datastoreName) => {
+        datastoreName = datastoreName || 'default';
+        const database = getDatabases()[datastoreName];
+        if (!database) {
+            throw new Error(`No database named ${datastoreName}`);
+        }
+        const orm = getOrm(database);
+        return {
+            Model: orm.Model,
+            fetcher: orm.fetcher,
+        };
+    };
     return {
         getDatabaseObjects,
         getOrm,
         getDatabases,
         cleanup,
-        modelCrudsServices,
-        modelCrudsServiceWrappers,
+        getModelProps,
     };
 };
 export { create };

package/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"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"}

package/types.d.ts

@@ -1,6 +1,5 @@
-import { FunctionalModel, Model, ModelFetcher } from 'functional-models/interfaces.js';
-import { DatastoreProvider, OrmModel, OrmModelFactory, OrmQuery } from 'functional-models-orm';
-import { Config } from '@node-in-layers/core/index.js';
+import { DataDescription, ModelType, DatastoreAdapter, OrmModel, OrmSearch, Orm } from 'functional-models';
+import { Config, GetModelPropsFunc } from '@node-in-layers/core/index.js';
 declare enum DataNamespace {
     root = "@node-in-layers/data"
 }
@@ -16,7 +15,7 @@ declare enum SupportedDatabase {
 type BasicDatabaseProps = Readonly<{
     environment: string;
     systemName: string;
-    getTableNameForModel?: (systemName: string, environment: string, model: Model<any>) => string;
+    getTableNameForModel?: (systemName: string, environment: string, model: ModelType<any>) => string;
 }>;
 type KnexConfigProps = Readonly<{
     username?: string;
@@ -51,7 +50,7 @@ type DynamoDatabaseObjectsProps = Readonly<{
 type DatabaseObjectsProps = Readonly<{
     datastoreType: SupportedDatabase;
 }> & BasicDatabaseProps & (DynamoDatabaseObjectsProps | OpensearchDatabaseObjectsProps | MongoDatabaseObjectsProps | SqlDatabaseObjectsProps);
-type SearchResult<T extends FunctionalModel> = Readonly<{
+type SearchResult<T extends DataDescription> = Readonly<{
     instances: readonly T[];
     page?: any;
 }>;
@@ -74,9 +73,9 @@ type DataConfig = Config & {
  */
 type DatabaseObjects<T extends object = object> = {
     /**
-     * This datastoreProvider is used for backing the ORM system.
+     * This datastoreAdapter is used for backing the ORM system.
      */
-    datastoreProvider: DatastoreProvider;
+    datastoreAdapter: DatastoreAdapter;
     /**
      * A cleanup function that should run at the end of the application, that cleans up database connections.
      */
@@ -85,7 +84,7 @@ type DatabaseObjects<T extends object = object> = {
 /**
  * An interface for making CRUDS (create/retrieve/update/delete/search) commands into a database.
  */
-type ModelCrudsInterface<T extends FunctionalModel> = Readonly<{
+type ModelCrudsInterface<T extends DataDescription> = Readonly<{
     /**
      * Gets the underlying model.
      */
@@ -114,19 +113,16 @@ type ModelCrudsInterface<T extends FunctionalModel> = Readonly<{
      * Searches the corresponding table for this item.
      * @param ormQuery
      */
-    search: (ormQuery: OrmQuery) => Promise<SearchResult<T>>;
+    search: (ormQuery: OrmSearch) => Promise<SearchResult<T>>;
 }>;
 /**
  * Data services.
  */
 type DataServices = Readonly<{
-    getDatabaseObjects: (props: DatabaseObjectsProps) => Promise<DatabaseObjects> | DatabaseObjects;
+    getDatabaseObjects: (props: DatabaseObjectsProps) => DatabaseObjects;
     getOrm: (props: {
-        datastoreProvider: DatastoreProvider;
-    }) => {
-        Model: OrmModelFactory;
-        fetcher: ModelFetcher;
-    };
+        datastoreAdapter: DatastoreAdapter;
+    }) => Orm;
     /**
      * Gets all databases. This is memoized, so on the first attempt, it will create connections to 1 or more databases
      * and then give you access to those database objects for further use. Very useful in a services layer.
@@ -136,8 +132,10 @@ type DataServices = Readonly<{
      * Runs cleanup on every database connection. Only run when the application is ending.
      */
     cleanup: () => Promise<void>;
-    modelCrudsServices: <T extends FunctionalModel>(model: OrmModel<T>) => ModelCrudsInterface<T>;
-    modelCrudsServiceWrappers: (models: OrmModel<any>[]) => Record<string, ModelCrudsInterface<any>>;
+    /**
+     * A function that gives ModelProps. This is useful for getting enabling ORM based models.
+     */
+    getModelProps: GetModelPropsFunc;
 }>;
 /**
  * The services for the Data package.
@@ -149,7 +147,7 @@ type DataServicesLayer = Readonly<{
  * The Features for the Data package.
  */
 type DataFeatures = Readonly<{
-    wrapModelCrudsService: <T extends FunctionalModel>(modelCruds: ModelCrudsInterface<T>, overrides: Partial<ModelCrudsInterface<T>>) => ModelCrudsInterface<T>;
+    wrapModelCrudsService: <T extends DataDescription>(modelCruds: ModelCrudsInterface<T>, overrides: Partial<ModelCrudsInterface<T>>) => ModelCrudsInterface<T>;
     wrapAllModelCrudsServices: (objs: Record<string, ModelCrudsInterface<any>>, overrides?: Record<string, ModelCrudsInterface<any>>) => Record<string, ModelCrudsInterface<any>>;
 }>;
 /**

package/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAaA,IAAK,aAEJ;AAFD,WAAK,aAAa;IAChB,8CAA6B,CAAA;AAC/B,CAAC,EAFI,aAAa,KAAb,aAAa,QAEjB;AAED,IAAK,iBAQJ;AARD,WAAK,iBAAiB;IACpB,sCAAiB,CAAA;IACjB,sCAAiB,CAAA;IACjB,oCAAe,CAAA;IACf,8CAAyB,CAAA;IACzB,oCAAe,CAAA;IACf,0CAAqB,CAAA;IACrB,sCAAiB,CAAA;AACnB,CAAC,EARI,iBAAiB,KAAjB,iBAAiB,QAQrB;AAkND,OAAO,EAIL,aAAa,EACb,iBAAiB,GAiBlB,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAUA,IAAK,aAEJ;AAFD,WAAK,aAAa;IAChB,8CAA6B,CAAA;AAC/B,CAAC,EAFI,aAAa,KAAb,aAAa,QAEjB;AAED,IAAK,iBAQJ;AARD,WAAK,iBAAiB;IACpB,sCAAiB,CAAA;IACjB,sCAAiB,CAAA;IACjB,oCAAe,CAAA;IACf,8CAAyB,CAAA;IACzB,oCAAe,CAAA;IACf,0CAAqB,CAAA;IACrB,sCAAiB,CAAA;AACnB,CAAC,EARI,iBAAiB,KAAjB,iBAAiB,QAQrB;AA2MD,OAAO,EAIL,aAAa,EACb,iBAAiB,GAiBlB,CAAA"}