@fibery/schema 10.2.11 → 10.2.13

package/lib/src/factory.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protectiveFactory = exports.factory = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+const keyBy_1 = __importDefault(require("lodash/keyBy"));
 const field_object_1 = require("./field-object");
 const schema_1 = require("./schema");
 const type_object_1 = require("./type-object");
@@ -17,11 +17,11 @@ exports.factory = {
         factory: exports.factory,
     }),
     makeTypeObject: (args) => new type_object_1.TypeObject({ ...args, factory: exports.factory }),
-    makeTypeObjectsById: (typeObjects) => lodash_1.default.keyBy(typeObjects, (x) => x.id),
-    makeTypeObjectsByName: (typeObjects) => lodash_1.default.keyBy(typeObjects, (x) => x.name),
+    makeTypeObjectsById: (typeObjects) => (0, keyBy_1.default)(typeObjects, (x) => x.id),
+    makeTypeObjectsByName: (typeObjects) => (0, keyBy_1.default)(typeObjects, (x) => x.name),
     makeFieldObject: (args) => new field_object_1.FieldObject(args),
-    makeFieldObjectsById: ({ fieldObjects }) => lodash_1.default.keyBy(fieldObjects, (x) => x.id),
-    makeFieldObjectsByName: ({ fieldObjects }) => lodash_1.default.keyBy(fieldObjects, (x) => x.name),
+    makeFieldObjectsById: ({ fieldObjects }) => (0, keyBy_1.default)(fieldObjects, (x) => x.id),
+    makeFieldObjectsByName: ({ fieldObjects }) => (0, keyBy_1.default)(fieldObjects, (x) => x.name),
 };
 exports.protectiveFactory = {
     makeSchema: (rawSchema, options = { shouldRemoveDeletedTypesAndFields: true }) => (0, utils_1.withOnlyDefinedGets)(new schema_1.Schema({
@@ -34,12 +34,12 @@ exports.protectiveFactory = {
         const typeObject = new type_object_1.TypeObject({ ...args, factory: exports.protectiveFactory });
         return (0, utils_1.withOnlyDefinedGets)(typeObject, `schema.typeObjectsByName["${typeObject.name}"]`);
     },
-    makeTypeObjectsById: (typeObjects) => (0, utils_1.withOnlyDefinedGets)(lodash_1.default.keyBy(typeObjects, (x) => x.id), "schema.typeObjectsById"),
-    makeTypeObjectsByName: (typeObjects) => (0, utils_1.withOnlyDefinedGets)(lodash_1.default.keyBy(typeObjects, (x) => x.name), "schema.typeObjectsByName"),
+    makeTypeObjectsById: (typeObjects) => (0, utils_1.withOnlyDefinedGets)((0, keyBy_1.default)(typeObjects, (x) => x.id), "schema.typeObjectsById"),
+    makeTypeObjectsByName: (typeObjects) => (0, utils_1.withOnlyDefinedGets)((0, keyBy_1.default)(typeObjects, (x) => x.name), "schema.typeObjectsByName"),
     makeFieldObject: (args) => {
         const fieldObject = new field_object_1.FieldObject(args);
         return (0, utils_1.withOnlyDefinedGets)(fieldObject, `schema.typeObjectsByName["${fieldObject.holderType}"].fieldObjectsByName["${fieldObject.name}"]`);
     },
-    makeFieldObjectsById: ({ type, fieldObjects }) => (0, utils_1.withOnlyDefinedGets)(lodash_1.default.keyBy(fieldObjects, (x) => x.id), `schema.typeObjectsByName["${type}"].fieldObjectsById`),
-    makeFieldObjectsByName: ({ type, fieldObjects }) => (0, utils_1.withOnlyDefinedGets)(lodash_1.default.keyBy(fieldObjects, (x) => x.name), `schema.typeObjectsByName["${type}"].fieldObjectsByName`),
+    makeFieldObjectsById: ({ type, fieldObjects }) => (0, utils_1.withOnlyDefinedGets)((0, keyBy_1.default)(fieldObjects, (x) => x.id), `schema.typeObjectsByName["${type}"].fieldObjectsById`),
+    makeFieldObjectsByName: ({ type, fieldObjects }) => (0, utils_1.withOnlyDefinedGets)((0, keyBy_1.default)(fieldObjects, (x) => x.name), `schema.typeObjectsByName["${type}"].fieldObjectsByName`),
 };

package/lib/src/field-keys.d.ts

@@ -0,0 +1,4 @@
+export type IdField = "fibery/id";
+export type PublicIdField = "fibery/public-id";
+export type RankField = "fibery/rank";
+export type TitleField = "__NOTHING_INTERESTING__TitleField__";

package/lib/src/field-keys.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/field-object.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldObject = void 0;
-/* eslint-disable no-use-before-define */
-const lodash_1 = __importDefault(require("lodash"));
+const isFunction_1 = __importDefault(require("lodash/isFunction"));
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const isString_1 = __importDefault(require("lodash/isString"));
+const once_1 = __importDefault(require("lodash/once"));
 const utils_1 = require("./utils");
 class FieldObject {
     name;
@@ -47,16 +49,16 @@ class FieldObject {
     isDependency;
     isDependencyStart;
     constructor({ rawFieldObject, holderType, resolveTypeObject, version, resolveMultiRelatedFieldObjects, }) {
-        if (!lodash_1.default.isPlainObject(rawFieldObject)) {
+        if (!(0, isPlainObject_1.default)(rawFieldObject)) {
             throw new Error("rawFieldObject arg must be plain object");
         }
-        if (!lodash_1.default.isString(holderType)) {
+        if (!(0, isString_1.default)(holderType)) {
             throw new Error("holderType arg must be string");
         }
-        if (!lodash_1.default.isFunction(resolveTypeObject)) {
+        if (!(0, isFunction_1.default)(resolveTypeObject)) {
             throw new Error("resolveTypeObject arg must be function");
         }
-        if (!lodash_1.default.isFunction(resolveMultiRelatedFieldObjects)) {
+        if (!(0, isFunction_1.default)(resolveMultiRelatedFieldObjects)) {
             throw new Error("resolveMultiRelationFieldObjects arg must be function");
         }
         this.name = rawFieldObject["fibery/name"];
@@ -95,12 +97,12 @@ class FieldObject {
             typeObject: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => resolveTypeObject(this.type)),
+                get: (0, once_1.default)(() => resolveTypeObject(this.type)),
             },
             mixinTypeObject: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     return this.holderTypeObject.installedMixinTypeObjects.find((mixinTypeObject) => Object.hasOwn(mixinTypeObject.fieldObjectsByName, this.name) ||
                         (this.name === "workflow/state" && mixinTypeObject.name === "workflow/workflow"));
                 }),
@@ -108,19 +110,19 @@ class FieldObject {
             holderTypeObject: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     return resolveTypeObject(holderType);
                 }),
             },
             nameParts: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => (0, utils_1.parseType)(rawFieldObject["fibery/name"])),
+                get: (0, once_1.default)(() => (0, utils_1.parseType)(rawFieldObject["fibery/name"])),
             },
             title: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     if (this.name === "fibery/role" && this.holderType === "fibery/user") {
                         return "User Role";
                     }
@@ -130,7 +132,7 @@ class FieldObject {
             multiRelatedFieldObjects: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     const { multiRelation, typeObject } = this;
                     if (!multiRelation || !typeObject.isEntityRef) {
                         return [];
@@ -141,7 +143,7 @@ class FieldObject {
             isMultiField: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     return this.typeObject.isEntityRef;
                 }),
             },

package/lib/src/schema.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Schema = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+const once_1 = __importDefault(require("lodash/once"));
 class Schema {
     typeObjects;
     typeObjectsById;
@@ -21,7 +21,7 @@ class Schema {
                 enumerable: false,
             },
         });
-        const getTypeComponentTypeToFieldObject = lodash_1.default.once(() => {
+        const getTypeComponentTypeToFieldObject = (0, once_1.default)(() => {
             const typeComponentTypeToFieldObject = new Map();
             this.typeObjects
                 .flatMap((typeObject) => typeObject.fieldObjects)

package/lib/src/type-object.d.ts

@@ -1,4 +1,5 @@
 import { FieldObject, FieldObjectParams, RawFieldObject } from "./field-object";
+import type { IdField, PublicIdField, RankField, TitleField } from "./field-keys";
 export type SyncSource = {
     appId: string;
     appName: string;
@@ -80,21 +81,21 @@ export declare class TypeObject {
     isEntityRef: boolean;
     constructor({ rawTypeObject, resolveTypeObject, getTypeComponentTypeToFieldObject, version, factory, resolveMultiRelatedFieldObjects, }: TypeObjectParams);
     _getFieldObjectShortcuts: () => {
-        idField: string;
+        idField: IdField;
         idFieldObject: FieldObject;
-        publicIdField: string;
+        publicIdField: PublicIdField;
         publicIdFieldObject: FieldObject;
-        titleField: string;
+        titleField: TitleField;
         titleFieldObject: FieldObject;
-        rankField: null | string;
-        rankFieldObject: null | FieldObject;
+        rankField: RankField | null;
+        rankFieldObject: FieldObject | null;
     };
-    get idField(): string;
+    get idField(): IdField;
     get idFieldObject(): FieldObject;
-    get publicIdField(): string;
+    get publicIdField(): PublicIdField;
     get publicIdFieldObject(): FieldObject;
-    get titleField(): string;
+    get titleField(): TitleField;
     get titleFieldObject(): FieldObject;
-    get rankField(): string | null;
+    get rankField(): RankField | null;
     get rankFieldObject(): FieldObject | null;
 }

package/lib/src/type-object.js

@@ -4,8 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeObject = void 0;
-/* eslint-disable no-use-before-define */
-const lodash_1 = __importDefault(require("lodash"));
+const isFunction_1 = __importDefault(require("lodash/isFunction"));
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const once_1 = __importDefault(require("lodash/once"));
 const utils_1 = require("./utils");
 const pluralize_1 = require("@fibery/pluralize");
 class TypeObject {
@@ -38,10 +39,10 @@ class TypeObject {
     isDeleted;
     isEntityRef;
     constructor({ rawTypeObject, resolveTypeObject, getTypeComponentTypeToFieldObject, version, factory, resolveMultiRelatedFieldObjects, }) {
-        if (!lodash_1.default.isPlainObject(rawTypeObject)) {
+        if (!(0, isPlainObject_1.default)(rawTypeObject)) {
             throw new Error("rawTypeObject arg must be plain object");
         }
-        if (!lodash_1.default.isFunction(resolveTypeObject)) {
+        if (!(0, isFunction_1.default)(resolveTypeObject)) {
             throw new Error("resolveTypeObject arg must be function");
         }
         this.name = rawTypeObject["fibery/name"];
@@ -65,13 +66,13 @@ class TypeObject {
         this.syncSource = rawMeta["sync/source"] || null;
         this.version = version;
         this.isEntityRef = rawTypeObject["fibery/name"] === "fibery/entity-ref";
-        const fieldObjectsByNameOnceGetter = lodash_1.default.once(() => {
+        const fieldObjectsByNameOnceGetter = (0, once_1.default)(() => {
             return factory.makeFieldObjectsByName({
                 type: this.name,
                 fieldObjects: this.fieldObjects,
             });
         });
-        const fieldObjectsGetter = lodash_1.default.once(() => rawTypeObject["fibery/fields"].map((rawFieldObject) => {
+        const fieldObjectsGetter = (0, once_1.default)(() => rawTypeObject["fibery/fields"].map((rawFieldObject) => {
             return factory.makeFieldObject({
                 rawFieldObject,
                 holderType: this.name,
@@ -105,7 +106,7 @@ class TypeObject {
             fieldObjectsById: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => {
+                get: (0, once_1.default)(() => {
                     return factory.makeFieldObjectsById({
                         type: this.name,
                         fieldObjects: this.fieldObjects,
@@ -120,26 +121,26 @@ class TypeObject {
             installedMixinTypeObjects: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => [...this.installedMixins].map(resolveTypeObject).filter((typeObject) => typeObject)),
+                get: (0, once_1.default)(() => [...this.installedMixins].map(resolveTypeObject).filter((typeObject) => typeObject)),
             },
             title: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => (0, utils_1.toTitle)(this.name)),
+                get: (0, once_1.default)(() => (0, utils_1.toTitle)(this.name)),
             },
             pluralTitle: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => pluralize_1.pluralize.plural((0, utils_1.toTitle)(this.name))),
+                get: (0, once_1.default)(() => pluralize_1.pluralize.plural((0, utils_1.toTitle)(this.name))),
             },
             singularTitle: {
                 configurable: false,
                 enumerable: true,
-                get: lodash_1.default.once(() => pluralize_1.pluralize.singular((0, utils_1.toTitle)(this.name))),
+                get: (0, once_1.default)(() => pluralize_1.pluralize.singular((0, utils_1.toTitle)(this.name))),
             },
         });
     }
-    _getFieldObjectShortcuts = lodash_1.default.once(() => {
+    _getFieldObjectShortcuts = (0, once_1.default)(() => {
         const hasRank = this.installedMixins.has("fibery/rank-mixin");
         return this.fieldObjects.reduce((result, fieldObject) => {
             if (fieldObject.isId) {

package/lib/src/utils.d.ts

@@ -1,4 +1,3 @@
-import _ from "lodash";
 import { RawSchema } from "./schema";
 import { TypeObject } from "./type-object";
 export declare const withOnlyDefinedGets: (target: any, targetKind?: string) => any;
@@ -17,7 +16,7 @@ export declare const toTitle: (typeOrAttr: string) => string;
 export declare const parseType: ((type: any) => {
     namespace: string;
     name: string;
-}) & _.MemoizedFunction;
+}) & import("lodash").MemoizedFunction;
 export declare const makeEnumTypeNamePart: ({ holderType, enumName }: {
     holderType: string;
     enumName: string;

package/lib/src/utils.js

@@ -5,7 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTypeObjectTitle = exports.removeDeletedTypesAndFields = exports.attachEnumNamespace = exports.makeEnumTypeNamePart = exports.parseType = exports.toTitle = exports.parseEnumType = exports.toNonEnumTitle = exports.toPascalCase = exports.toTypeOrFieldTitle = exports.toTypeOrFieldNamePartTitle = exports.capitalizeFirstChar = exports.withOnlyDefinedGets = void 0;
 const trace_1 = require("@fibery/helpers/utils/trace");
-const lodash_1 = __importDefault(require("lodash"));
+const capitalize_1 = __importDefault(require("lodash/capitalize"));
+const flow_1 = __importDefault(require("lodash/flow"));
+const last_1 = __importDefault(require("lodash/last"));
+const memoize_1 = __importDefault(require("lodash/memoize"));
 const errors_1 = require("./errors");
 const print_utils_1 = require("./print-utils");
 const jestKey = new Set(["nodeType", "tagName", "hasAttribute"]);
@@ -87,9 +90,9 @@ const capitalizeFirstChar = (input) => {
 };
 exports.capitalizeFirstChar = capitalizeFirstChar;
 const replaceTildes = (str) => (str || "").split("~").join(" ");
-exports.toTypeOrFieldNamePartTitle = lodash_1.default.flow([exports.capitalizeFirstChar, replaceTildes]);
-exports.toTypeOrFieldTitle = lodash_1.default.flow([getNamePart, exports.toTypeOrFieldNamePartTitle]);
-const toPascalCase = (lispCasedString = "") => lispCasedString && (lodash_1.default.last(lispCasedString.split("/")) || "").split("-").map(lodash_1.default.capitalize).join(" ");
+exports.toTypeOrFieldNamePartTitle = (0, flow_1.default)([exports.capitalizeFirstChar, replaceTildes]);
+exports.toTypeOrFieldTitle = (0, flow_1.default)([getNamePart, exports.toTypeOrFieldNamePartTitle]);
+const toPascalCase = (lispCasedString = "") => lispCasedString && ((0, last_1.default)(lispCasedString.split("/")) || "").split("-").map(capitalize_1.default).join(" ");
 exports.toPascalCase = toPascalCase;
 const isObsoleteTitle = (str) => {
     const { name } = splitKeyword(str);
@@ -138,7 +141,7 @@ const splitKeyword = (keyword) => {
         name,
     };
 };
-exports.parseType = lodash_1.default.memoize((type) => {
+exports.parseType = (0, memoize_1.default)((type) => {
     if (!type.includes("/")) {
         (0, trace_1.traceError)(`parseType invalid usage: passed type is '${type}'`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/schema",
-  "version": "10.2.11",
+  "version": "10.2.13",
   "description": "Fibery schema utils",
   "main": "./lib/index.js",
   "files": [
@@ -19,22 +19,21 @@
   "dependencies": {
     "lodash": "4.17.21",
     "memoize-one": "6.0.0",
-    "@fibery/helpers": "1.3.4",
-    "@fibery/pluralize": "1.0.2"
+    "@fibery/pluralize": "1.1.0",
+    "@fibery/helpers": "1.4.0"
   },
   "devDependencies": {
     "@babel/core": "7.28.5",
     "@swc/jest": "0.2.39",
     "@types/lodash": "4.14.172",
-    "@types/node": "24.10.1",
     "babel-loader": "10.0.0",
     "jest": "30.2.0",
     "jest-junit": "16.0.0",
     "typescript": "5.9.3",
     "webpack": "5.87.0",
-    "webpack-cli": "4.10.0",
-    "@fibery/eslint-config": "8.6.2",
-    "@fibery/babel-preset": "7.4.1"
+    "webpack-cli": "6.0.1",
+    "@fibery/babel-preset": "7.4.1",
+    "@fibery/eslint-config": "9.0.0"
   },
   "jest": {
     "testEnvironment": "node",
@@ -81,7 +80,8 @@
     "test": "jest",
     "test:ci": "pnpm run test --reporters=default --reporters=jest-junit",
     "test:coverage": "pnpm run test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/schema --reporters=default --reporters=jest-junit",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "typecheck": "tsc --noEmit"
   },
   "types": "./lib/index.d.ts"
 }