functional-models 2.1.13 → 3.0.0

package/lib.js

@@ -12,15 +12,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isModelInstance = exports.mergeValidators = exports.getCommonNumberValidators = exports.getValidatorFromConfigElseEmpty = exports.getCommonTextValidators = exports.getValueForReferencedModel = exports.getValueForModelInstance = exports.isReferencedProperty = void 0;
+exports.NULL_METHOD = exports.NULL_ENDPOINT = exports.populateApiInformation = exports.buildValidEndpoint = exports.getModelName = exports.isModelInstance = exports.mergeValidators = exports.getCommonNumberValidators = exports.getValidatorFromConfigElseEmpty = exports.getCommonTextValidators = exports.getValueForReferencedModel = exports.getValueForModelInstance = exports.isReferencedProperty = void 0;
+const openapi_types_1 = require("openapi-types");
+const kebabCase_1 = __importDefault(require("lodash/kebabCase"));
+const merge_1 = __importDefault(require("lodash/merge"));
 const get_1 = __importDefault(require("lodash/get"));
+const types_1 = require("./types");
 const utils_1 = require("./utils");
 const validation_1 = require("./validation");
+var HttpMethods = openapi_types_1.OpenAPIV3.HttpMethods;
+const NULL_ENDPOINT = 'NULL';
+exports.NULL_ENDPOINT = NULL_ENDPOINT;
+const NULL_METHOD = HttpMethods.HEAD;
+exports.NULL_METHOD = NULL_METHOD;
+const ID_KEY = ':id';
 const getValueForReferencedModel = (modelInstance, path) => __awaiter(void 0, void 0, void 0, function* () {
     const [head, tail] = (0, utils_1.createHeadAndTail)(path.split('.'), '.');
     // If there are no nested keys, just return the reference id.
     if (!tail) {
-        return modelInstance.references[head]();
+        return modelInstance.getReferences()[head]();
     }
     const modelReference = yield modelInstance.get[head]();
     if (modelReference.toObj) {
@@ -41,7 +51,7 @@ const getValueForModelInstance = (modelInstance, path) => __awaiter(void 0, void
 });
 exports.getValueForModelInstance = getValueForModelInstance;
 const isReferencedProperty = (modelInstance, key) => {
-    return modelInstance.references[key];
+    return modelInstance.getReferences()[key];
 };
 exports.isReferencedProperty = isReferencedProperty;
 const getCommonTextValidators = (config) => {
@@ -51,9 +61,7 @@ const getCommonTextValidators = (config) => {
     ];
 };
 exports.getCommonTextValidators = getCommonTextValidators;
-const getValidatorFromConfigElseEmpty = (input, 
-// eslint-disable-next-line no-unused-vars
-validatorGetter) => {
+const getValidatorFromConfigElseEmpty = (input, validatorGetter) => {
     if (input !== undefined) {
         const validator = validatorGetter(input);
         return validator;
@@ -68,13 +76,117 @@ const getCommonNumberValidators = (config) => {
     ];
 };
 exports.getCommonNumberValidators = getCommonNumberValidators;
-const mergeValidators = (config, validators) => {
+const mergeValidators = (config, ...validators) => {
     return [...validators, ...((config === null || config === void 0 ? void 0 : config.validators) ? config.validators : [])];
 };
 exports.mergeValidators = mergeValidators;
 const isModelInstance = (obj) => {
     // @ts-ignore
-    return Boolean(obj && obj.getPrimaryKeyName);
+    return Boolean(obj && obj.getPrimaryKey);
 };
 exports.isModelInstance = isModelInstance;
+const getModelName = (namespace, pluralName) => {
+    return (0, kebabCase_1.default)(`${namespace}-${pluralName}`).toLowerCase();
+};
+exports.getModelName = getModelName;
+const buildValidEndpoint = (...components) => {
+    const suffix = components
+        .map(x => {
+        if (x === ID_KEY) {
+            return x;
+        }
+        return (0, kebabCase_1.default)(x);
+    })
+        .map(s => s.toLowerCase())
+        .join('/');
+    return `/${suffix}`;
+};
+exports.buildValidEndpoint = buildValidEndpoint;
+const _generateRestInfo = (method, withId, ...additional) => (pluralName, namespace) => (existing) => {
+    if (existing) {
+        return Object.assign({ 
+            // Default add security, then override it.
+            security: {} }, existing);
+    }
+    const endpoint = withId
+        ? buildValidEndpoint(namespace, pluralName, ID_KEY)
+        : buildValidEndpoint(namespace, pluralName, ...additional);
+    return {
+        method,
+        endpoint,
+        // We cannot auto create security.
+        security: {},
+    };
+};
+const _apiMethodToRestInfoGenerator = {
+    [types_1.ApiMethod.create]: _generateRestInfo(HttpMethods.POST, false),
+    [types_1.ApiMethod.retrieve]: _generateRestInfo(HttpMethods.GET, true),
+    [types_1.ApiMethod.update]: _generateRestInfo(HttpMethods.PUT, true),
+    [types_1.ApiMethod.delete]: _generateRestInfo(HttpMethods.DELETE, true),
+    [types_1.ApiMethod.search]: _generateRestInfo(HttpMethods.POST, false, 'search'),
+};
+const getNullRestInfo = () => {
+    return {
+        endpoint: NULL_ENDPOINT,
+        method: NULL_METHOD,
+        security: {},
+    };
+};
+const _fillOutRestInfo = (pluralName, namespace, partial, nullRest) => {
+    const finishedRestInfo = Object.entries(types_1.ApiMethod).reduce((acc, [, method]) => {
+        const existing = partial && partial.rest && partial.rest[method]
+            ? partial.rest[method]
+            : undefined;
+        const restInfo = _apiMethodToRestInfoGenerator[method](pluralName, namespace)(existing);
+        return (0, merge_1.default)(acc, {
+            [method]: restInfo,
+        });
+    }, nullRest);
+    return {
+        noPublish: false,
+        onlyPublish: [],
+        rest: finishedRestInfo,
+        createOnlyOne: (partial === null || partial === void 0 ? void 0 : partial.createOnlyOne) || false,
+    };
+};
+const populateApiInformation = (pluralName, namespace, partial) => {
+    const nullRest = {
+        delete: getNullRestInfo(),
+        search: getNullRestInfo(),
+        update: getNullRestInfo(),
+        retrieve: getNullRestInfo(),
+        create: getNullRestInfo(),
+    };
+    if (!partial) {
+        return _fillOutRestInfo(pluralName, namespace, partial, nullRest);
+    }
+    // Are we not going to publish at all? All "nulled" out.
+    if (partial.noPublish) {
+        return {
+            onlyPublish: [],
+            noPublish: true,
+            rest: nullRest,
+            createOnlyOne: false,
+        };
+    }
+    const rest = partial.rest || {};
+    // Should we only publish some but not all?
+    if (partial.onlyPublish && partial.onlyPublish.length > 0) {
+        return partial.onlyPublish.reduce((acc, method) => {
+            const restInfo = _apiMethodToRestInfoGenerator[method](pluralName, namespace)(rest[method]);
+            return (0, merge_1.default)(acc, {
+                rest: {
+                    [method]: restInfo,
+                },
+            });
+        }, {
+            noPublish: false,
+            onlyPublish: partial.onlyPublish,
+            createOnlyOne: Boolean(partial.createOnlyOne),
+            rest: nullRest,
+        });
+    }
+    return _fillOutRestInfo(pluralName, namespace, partial, nullRest);
+};
+exports.populateApiInformation = populateApiInformation;
 //# sourceMappingURL=lib.js.map

package/lib.js.map

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

package/models.d.ts

@@ -1,4 +1,14 @@
-import { Model, ModelFactory } from './interfaces';
-declare const BaseModel: ModelFactory;
+import { ModelFactory, RestInfo } from './types';
+/**
+ * An out of the box ModelFactory that can create Models.
+ * @param options - Any additional model options
+ * @returns A simple Model function ready for creating models. See {@link ModelType}
+ */
 declare const Model: ModelFactory;
-export { BaseModel, Model };
+/**
+ * A useful function for determining if a RestInfo found in an ApiInfo is "null" or not.
+ * That is, whether it should be used and considered.
+ * @param restInfo
+ */
+declare const isNullRestInfo: (restInfo: RestInfo) => boolean;
+export { Model, isNullRestInfo };

package/models.js

@@ -3,27 +3,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = exports.BaseModel = void 0;
+exports.isNullRestInfo = exports.Model = void 0;
 const merge_1 = __importDefault(require("lodash/merge"));
 const serialization_1 = require("./serialization");
 const validation_1 = require("./validation");
-const properties_1 = require("./properties");
-const lazy_1 = require("./lazy");
+const lib_1 = require("./lib");
 const utils_1 = require("./utils");
 const _defaultOptions = () => ({
-    instanceCreatedCallback: null,
+    instanceCreatedCallback: undefined,
 });
 const _convertOptions = (options) => {
     const r = (0, merge_1.default)({}, _defaultOptions(), options);
     return r;
 };
-const _createModelDefWithPrimaryKey = (modelDefinition) => {
-    const properties = (0, merge_1.default)({
-        id: (0, properties_1.UniqueId)({ required: true }),
-    }, modelDefinition.properties);
-    return Object.assign(Object.assign({}, modelDefinition), { getPrimaryKeyName: () => 'id', properties });
+const _toModelDefinition = (minimal) => {
+    return Object.assign({ singularName: (0, utils_1.singularize)(minimal.pluralName), displayName: (0, utils_1.toTitleCase)(minimal.pluralName), description: '', primaryKeyName: 'id', modelValidators: [] }, minimal);
 };
-const BaseModel = (pluralName, modelDefinition, options) => {
+const _validateModelDefinition = (modelDefinition) => {
+    const primaryKeyProperty = 
+    // @ts-ignore
+    modelDefinition.properties[modelDefinition.primaryKeyName || 'id'];
+    if (!primaryKeyProperty) {
+        throw new Error(`Property missing for primaryKey named ${modelDefinition.primaryKeyName}`);
+    }
+    if (!modelDefinition.pluralName) {
+        throw new Error(`Must include pluralName for model.`);
+    }
+    if (!modelDefinition.namespace) {
+        throw new Error(`Must include namespace for model.`);
+    }
+};
+/**
+ * An out of the box ModelFactory that can create Models.
+ * @param options - Any additional model options
+ * @returns A simple Model function ready for creating models. See {@link ModelType}
+ */
+const Model = (minimalModelDefinitions, options) => {
+    _validateModelDefinition(minimalModelDefinitions);
     /*
      * This non-functional approach is specifically used to
      * allow instances to be able to refer back to its parent without
@@ -34,11 +50,8 @@ const BaseModel = (pluralName, modelDefinition, options) => {
     // eslint-disable-next-line functional/no-let
     let model = null;
     const theOptions = _convertOptions(options);
-    modelDefinition = !modelDefinition.getPrimaryKeyName
-        ? _createModelDefWithPrimaryKey(modelDefinition)
-        : modelDefinition;
-    // @ts-ignore
-    const getPrimaryKeyName = () => modelDefinition.getPrimaryKeyName();
+    const modelDefinition = _toModelDefinition(minimalModelDefinitions);
+    const getPrimaryKeyName = () => modelDefinition.primaryKeyName;
     const getPrimaryKey = (loadedInternals) => {
         const property = loadedInternals.get[getPrimaryKeyName()];
         return property();
@@ -51,11 +64,13 @@ const BaseModel = (pluralName, modelDefinition, options) => {
             validators: {},
             references: {},
         };
-        const loadedInternals = Object.entries(modelDefinition.properties).reduce((acc, [key, property]) => {
-            const propertyGetter = (0, lazy_1.lazyValueSync)(() => property.createGetter(
-            // @ts-ignore
-            instanceValues[key], instanceValues, instance)());
-            // @ts-ignore
+        const prop = Object.entries(modelDefinition.properties);
+        const loadedInternals = prop.reduce((acc, [key, property]) => {
+            const propertyGetter = (0, utils_1.memoizeSync)(() => property.createGetter(
+            //@ts-ignore
+            instanceValues[key], instanceValues, 
+            // NOTE: By the time it gets here, it has already been implemented.
+            instance)());
             const propertyValidator = property.getValidator(propertyGetter);
             const fleshedOutInstanceProperties = {
                 get: {
@@ -78,19 +93,29 @@ const BaseModel = (pluralName, modelDefinition, options) => {
             return (0, merge_1.default)(acc, fleshedOutInstanceProperties, referencedProperty);
         }, startingInternals);
         const getModel = () => model;
-        const toObj = (0, serialization_1.toJsonAble)(loadedInternals.get);
-        const validate = (options = {}) => {
+        // We are casting this, because the output type is really complicated.
+        // and memoizing this is very important.
+        // @ts-ignore
+        const toObj = (0, utils_1.memoizeAsync)(() => {
+            return (0, serialization_1.toJsonAble)(loadedInternals.get)();
+        });
+        const validate = (0, utils_1.memoizeAsync)((options = {}) => {
             return Promise.resolve().then(() => {
-                return (0, validation_1.createModelValidator)(loadedInternals.validators, modelDefinition.modelValidators || [])(instance, options);
+                return (0, validation_1.createModelValidator)(loadedInternals.validators, modelDefinition.modelValidators)(instance, options);
             });
-        };
-        instance = (0, merge_1.default)(loadedInternals, {
+        });
+        const getReferences = () => loadedInternals.references;
+        const getValidators = () => loadedInternals.validators;
+        // @ts-ignore
+        instance = {
+            get: loadedInternals.get,
+            getReferences,
+            getValidators,
             getModel,
             toObj,
             getPrimaryKey: () => getPrimaryKey(loadedInternals),
-            getPrimaryKeyName,
             validate,
-        });
+        };
         if (theOptions.instanceCreatedCallback) {
             const toCall = Array.isArray(theOptions.instanceCreatedCallback)
                 ? theOptions.instanceCreatedCallback
@@ -99,21 +124,31 @@ const BaseModel = (pluralName, modelDefinition, options) => {
         }
         return instance;
     };
+    const getApiInfo = (0, utils_1.memoizeSync)(() => {
+        return (0, lib_1.populateApiInformation)(modelDefinition.pluralName, modelDefinition.namespace, modelDefinition.api);
+    });
     // This sets the model that is used by the instances later.
-    // @ts-ignore
-    model = (0, merge_1.default)({}, {
+    model = {
+        /**
+         * Creates a model instance.
+         */
         create,
-        getName: () => pluralName,
-        getSingularName: () => modelDefinition.singularName || (0, utils_1.singularize)(pluralName),
-        getDisplayName: () => modelDefinition.displayName || (0, utils_1.toTitleCase)(pluralName),
-        getModelDefinition: () => modelDefinition,
-        getPrimaryKeyName,
+        getName: () => (0, lib_1.getModelName)(modelDefinition.namespace, modelDefinition.pluralName),
+        getModelDefinition: (0, utils_1.memoizeSync)(() => modelDefinition),
         getPrimaryKey,
-        getOptions: () => theOptions,
-    });
+        getOptions: () => (Object.assign({}, theOptions)),
+        getApiInfo,
+    };
     return model;
 };
-exports.BaseModel = BaseModel;
-const Model = BaseModel;
 exports.Model = Model;
+/**
+ * A useful function for determining if a RestInfo found in an ApiInfo is "null" or not.
+ * That is, whether it should be used and considered.
+ * @param restInfo
+ */
+const isNullRestInfo = (restInfo) => {
+    return restInfo.method === lib_1.NULL_METHOD && restInfo.endpoint === lib_1.NULL_ENDPOINT;
+};
+exports.isNullRestInfo = isNullRestInfo;
 //# sourceMappingURL=models.js.map

package/models.js.map

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

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "functional-models",
-  "version": "2.1.13",
-  "description": "A library for creating JavaScript function based models.",
+  "version": "3.0.0",
+  "description": "Functional models is ooey gooey framework for building and using awesome models EVERYWHERE.",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "mocha -r ts-node/register test/**/*.test.ts",
-    "test:coverage": "NODE_OPTIONS='--max-old-space-size=8192' nyc npm run test",
+    "test": "mocha -r tsx --extensions ts,tsx 'test/**/*.{ts,tsx}'",
+    "mocha": "mocha -r tsx",
+    "test:coverage": "TS_NODE_PROJECT=tsconfig.test.json nyc npm run test",
     "test:watch": "nodemon -e '*' --watch test --watch src --exec npm run test:coverage",
     "commit": "cz",
     "feature-tests": "./node_modules/.bin/cucumber-js -p default",
     "coverage": "nyc --all --reporter=lcov npm test",
-    "build": "tsc -p ./tsconfig.build.json && cp package.json ./dist && cp README.md ./dist",
+    "build": "rm -Rf ./dist && tsc && cp package.json ./dist && cp README.md ./dist",
     "build:watch": "nodemon -e '*' --watch ./src --exec npm run build",
     "prettier": "prettier --write .",
     "eslint": "eslint . --fix",
@@ -22,6 +23,8 @@
     "url": "git+https://github.com/monolithst/functional-models.git"
   },
   "keywords": [
+    "framework",
+    "models",
     "orm",
     "modeling",
     "functional"
@@ -41,6 +44,10 @@
   },
   "homepage": "https://github.com/monolithst/functional-models#readme",
   "nyc": {
+    "branches": 90,
+    "lines": 100,
+    "functions": 100,
+    "statements": 100,
     "extends": "@istanbuljs/nyc-config-typescript",
     "check-coverage": true,
     "all": true,
@@ -67,37 +74,43 @@
   "devDependencies": {
     "@cucumber/cucumber": "^11.0.0",
     "@date-fns/utc": "^1.2.0",
+    "@eslint/compat": "^1.2.0",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.12.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/async-lock": "^1.1.3",
-    "@types/chai": "^4.2.22",
+    "@types/chai": "^5.0.1",
     "@types/chai-as-promised": "^7.1.4",
     "@types/lodash": "^4.14.176",
     "@types/mocha": "^9.0.0",
+    "@types/node": "^22.10.7",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.6",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
-    "babel-eslint": "^10.1.0",
-    "chai": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
+    "chai": "^5.1.2",
     "chai-as-promised": "^7.1.1",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.46.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-functional": "^6.0.0",
-    "eslint-plugin-import": "^2.28.0",
-    "mocha": "^10.4.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-functional": "~7.1.0",
+    "eslint-plugin-import": "^2.31.0",
+    "esprima": "^4.0.1",
+    "globals": "^15.14.0",
+    "mocha": "^11.0.1",
     "nodemon": "^3.1.0",
-    "nyc": "^15.1.0",
+    "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
     "sinon": "^18.0.1",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4"
+    "ts-node": "^9.1.1",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.3"
   },
   "dependencies": {
     "async-lock": "^1.3.0",
-    "date-fns": "^3.6.0",
     "get-random-values": "^1.2.2",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "openapi-types": "^12.1.3"
   }
 }