@bedrockio/model 0.20.2 → 0.21.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.21.1
+
+- Fixed issues with schema loading.
+
+## 0.21.0
+
+- Allow comments in schemas with .jsonc.
+
 ## 0.20.2
 
 - Fixed `_id: false` on validation schemas.

package/dist/cjs/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   createSchema: true,
   loadModel: true,
   loadModelDir: true,
+  loadSchema: true,
   addValidators: true,
   isEqual: true
 };
@@ -40,6 +41,12 @@ Object.defineProperty(exports, "loadModelDir", {
     return _load.loadModelDir;
   }
 });
+Object.defineProperty(exports, "loadSchema", {
+  enumerable: true,
+  get: function () {
+    return _load.loadSchema;
+  }
+});
 var _schema = require("./schema");
 var _load = require("./load");
 var _validation = require("./validation");

package/dist/cjs/load.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadModel = loadModel;
 exports.loadModelDir = loadModelDir;
+exports.loadSchema = loadSchema;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
+var _jsoncParser = require("jsonc-parser");
 var _lodash = require("lodash");
 var _mongoose = _interopRequireDefault(require("mongoose"));
 var _schema = require("./schema");
@@ -32,21 +34,77 @@ function loadModel(definition, name) {
 /**
  * Loads all model definitions in the given directory.
  * Returns the full loaded model set.
- * @param {string} dirPath
+ * @param {string} dir
  */
-function loadModelDir(dirPath) {
-  const files = _fs.default.readdirSync(dirPath);
+function loadModelDir(dir) {
+  const files = _fs.default.readdirSync(dir);
   for (const file of files) {
-    const basename = _path.default.basename(file, '.json');
-    if (file.match(/\.json$/)) {
-      const filePath = _path.default.join(dirPath, file);
-      const data = _fs.default.readFileSync(filePath, 'utf-8');
-      const definition = JSON.parse(data);
-      const modelName = definition.modelName || (0, _lodash.startCase)(basename).replace(/\s/g, '');
-      if (!_mongoose.default.models[modelName]) {
-        loadModel(definition, modelName);
-      }
+    const ext = _path.default.extname(file);
+    if (!SCHEMA_EXTENSIONS.includes(ext)) {
+      continue;
+    }
+    const {
+      name: basename
+    } = _path.default.parse(file);
+    const definition = loadDefinition(basename, dir);
+    const modelName = getModelName(definition, basename);
+    if (!_mongoose.default.models[modelName]) {
+      loadModel(definition, modelName);
     }
   }
   return _mongoose.default.models;
+}
+
+/**
+ * Loads the schema from a .json or .jsonc file.
+ * @param {string} name - The model or schema name.
+ * @param {string} [dir] - The schema directory (defaults to `src/models/definitions`)
+ */
+function loadSchema(name, dir) {
+  const definition = loadDefinition(name, dir);
+  return (0, _schema.createSchema)(definition);
+}
+const DEFINITION_DIR = 'src/models/definitions';
+const SCHEMA_EXTENSIONS = ['.json', '.jsonc'];
+function loadDefinition(name, dir) {
+  const {
+    filepath,
+    ext
+  } = resolvePath(name, dir);
+  const content = _fs.default.readFileSync(filepath, 'utf-8');
+  return ext === '.jsonc' ? (0, _jsoncParser.parse)(content) : JSON.parse(content);
+}
+function resolvePath(name, dir = DEFINITION_DIR) {
+  if (name.includes('.')) {
+    throw new Error('Name should not include extension');
+  }
+  let filename = (0, _lodash.kebabCase)(name);
+  let ext = _path.default.extname(name);
+  if (!ext) {
+    ext = resolveExtension(filename, dir);
+    if (ext) {
+      filename += ext;
+    } else {
+      throw new Error(`No .json or .jsonc file found for: ${name}`);
+    }
+  }
+  if (!SCHEMA_EXTENSIONS.includes(ext)) {
+    throw new Error(`Schema files must be .json or .jsonc`);
+  }
+  const filepath = _path.default.resolve(dir, filename);
+  return {
+    ext,
+    filepath
+  };
+}
+function resolveExtension(filename, dir) {
+  for (const ext of SCHEMA_EXTENSIONS) {
+    const filepath = _path.default.resolve(dir, filename + ext);
+    if (_fs.default.existsSync(filepath)) {
+      return ext;
+    }
+  }
+}
+function getModelName(definition, basename) {
+  return definition.modelName || (0, _lodash.startCase)(basename).replace(/\s/g, '');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.20.2",
+  "version": "0.21.1",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@bedrockio/logger": "^1.1.1",
+    "jsonc-parser": "^3.3.1",
     "lodash": "^4.17.21"
   },
   "peerDependencies": {

package/src/index.js

@@ -1,5 +1,5 @@
 export { createSchema } from './schema';
-export { loadModel, loadModelDir } from './load';
+export { loadModel, loadModelDir, loadSchema } from './load';
 export { addValidators } from './validation';
 export { isEqual } from './utils';
 export * from './testing';

package/src/load.js

@@ -1,6 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import { parse as parseWithComments } from 'jsonc-parser';
+import { kebabCase } from 'lodash';
 import { startCase } from 'lodash';
 import mongoose from 'mongoose';
 
@@ -27,22 +29,86 @@ export function loadModel(definition, name) {
 /**
  * Loads all model definitions in the given directory.
  * Returns the full loaded model set.
- * @param {string} dirPath
+ * @param {string} dir
  */
-export function loadModelDir(dirPath) {
-  const files = fs.readdirSync(dirPath);
+export function loadModelDir(dir) {
+  const files = fs.readdirSync(dir);
   for (const file of files) {
-    const basename = path.basename(file, '.json');
-    if (file.match(/\.json$/)) {
-      const filePath = path.join(dirPath, file);
-      const data = fs.readFileSync(filePath, 'utf-8');
-      const definition = JSON.parse(data);
-      const modelName =
-        definition.modelName || startCase(basename).replace(/\s/g, '');
-      if (!mongoose.models[modelName]) {
-        loadModel(definition, modelName);
-      }
+    const ext = path.extname(file);
+
+    if (!SCHEMA_EXTENSIONS.includes(ext)) {
+      continue;
+    }
+
+    const { name: basename } = path.parse(file);
+    const definition = loadDefinition(basename, dir);
+    const modelName = getModelName(definition, basename);
+
+    if (!mongoose.models[modelName]) {
+      loadModel(definition, modelName);
     }
   }
   return mongoose.models;
 }
+
+/**
+ * Loads the schema from a .json or .jsonc file.
+ * @param {string} name - The model or schema name.
+ * @param {string} [dir] - The schema directory (defaults to `src/models/definitions`)
+ */
+export function loadSchema(name, dir) {
+  const definition = loadDefinition(name, dir);
+  return createSchema(definition);
+}
+
+const DEFINITION_DIR = 'src/models/definitions';
+const SCHEMA_EXTENSIONS = ['.json', '.jsonc'];
+
+function loadDefinition(name, dir) {
+  const { filepath, ext } = resolvePath(name, dir);
+  const content = fs.readFileSync(filepath, 'utf-8');
+  return ext === '.jsonc' ? parseWithComments(content) : JSON.parse(content);
+}
+
+function resolvePath(name, dir = DEFINITION_DIR) {
+  if (name.includes('.')) {
+    throw new Error('Name should not include extension');
+  }
+
+  let filename = kebabCase(name);
+  let ext = path.extname(name);
+
+  if (!ext) {
+    ext = resolveExtension(filename, dir);
+
+    if (ext) {
+      filename += ext;
+    } else {
+      throw new Error(`No .json or .jsonc file found for: ${name}`);
+    }
+  }
+
+  if (!SCHEMA_EXTENSIONS.includes(ext)) {
+    throw new Error(`Schema files must be .json or .jsonc`);
+  }
+
+  const filepath = path.resolve(dir, filename);
+
+  return {
+    ext,
+    filepath,
+  };
+}
+
+function resolveExtension(filename, dir) {
+  for (const ext of SCHEMA_EXTENSIONS) {
+    const filepath = path.resolve(dir, filename + ext);
+    if (fs.existsSync(filepath)) {
+      return ext;
+    }
+  }
+}
+
+function getModelName(definition, basename) {
+  return definition.modelName || startCase(basename).replace(/\s/g, '');
+}

package/types/generated/index.d.ts

@@ -3,5 +3,5 @@ export { addValidators } from "./validation";
 export { isEqual } from "./utils";
 export * from "./testing";
 export * from "./errors";
-export { loadModel, loadModelDir } from "./load";
+export { loadModel, loadModelDir, loadSchema } from "./load";
 //# sourceMappingURL=index.d.ts.map

package/types/generated/load.d.ts

@@ -8,8 +8,30 @@ export function loadModel(definition: object, name: string): any;
 /**
  * Loads all model definitions in the given directory.
  * Returns the full loaded model set.
- * @param {string} dirPath
+ * @param {string} dir
  */
-export function loadModelDir(dirPath: string): mongoose.Models;
+export function loadModelDir(dir: string): mongoose.Models;
+/**
+ * Loads the schema from a .json or .jsonc file.
+ * @param {string} name - The model or schema name.
+ * @param {string} [dir] - The schema directory (defaults to `src/models/definitions`)
+ */
+export function loadSchema(name: string, dir?: string): mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, any, any, any, any, mongoose.DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, any, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & mongoose.FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}>;
 import mongoose from 'mongoose';
 //# sourceMappingURL=load.d.ts.map

package/types/generated/load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/load.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,sCAJW,MAAM,QACN,MAAM,OAahB;AAED;;;;GAIG;AACH,sCAFW,MAAM,mBAkBhB;qBA3CoB,UAAU"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/load.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,sCAJW,MAAM,QACN,MAAM,OAahB;AAED;;;;GAIG;AACH,kCAFW,MAAM,mBAoBhB;AAED;;;;GAIG;AACH,iCAHW,MAAM,QACN,MAAM;;;;;;;;;;;;;;;;GAKhB;qBAvDoB,UAAU"}