@ldsg/tables 0.3.32 → 0.3.34

package/dist/types/get-table-info.d.ts

@@ -3,9 +3,25 @@ import { ObjectInfo } from "@ldsg/object";
 import { GeneralResourceSettings } from "@ldsg/types";
 export interface TableInfo extends GeneralResourceSettings {
     /**
-     * Table Name
+     * Slug, used to derive name and collectionName
+     * kebab case
+     */
+    slug: string;
+    /**
+     * Table Name (derived from slug if slug is provided, otherwise from settings.name)
+     * camel case
      */
     name: string;
+    /**
+     * MongoDB collection name (derived from slug)
+     * snake case
+     */
+    collectionName: string;
+    /**
+     * mongoose model name (derived from slug)
+     * pascal case
+     */
+    modelName: string;
     /**
      * Object Info
      */

package/dist/types/get-table-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-table-info.d.ts","sourceRoot":"","sources":["../../src/types/get-table-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,WAAW,SAAU,SAAQ,uBAAuB;IACxD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,SAAS,CAAC"}
+{"version":3,"file":"get-table-info.d.ts","sourceRoot":"","sources":["../../src/types/get-table-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,WAAW,SAAU,SAAQ,uBAAuB;IACxD;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,SAAS,CAAC"}

package/dist/utils/handle-table-info-list/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/handle-table-info-list/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,UAAU,yBAA0B,SAAQ,oBAAoB;IAC9D,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,UAAU,sBAAsB;IAC9B,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,KAAK,mBAAmB,GAAG,CAAC,MAAM,EAAE,yBAAyB,KAAK,sBAAsB,CAAC;AAEzF,eAAO,MAAM,mBAAmB,EAAE,mBAsBjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/handle-table-info-list/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,UAAU,yBAA0B,SAAQ,oBAAoB;IAC9D,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,UAAU,sBAAsB;IAC9B,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,KAAK,mBAAmB,GAAG,CAAC,MAAM,EAAE,yBAAyB,KAAK,sBAAsB,CAAC;AAEzF,eAAO,MAAM,mBAAmB,EAAE,mBAuBjC,CAAC"}

package/dist/utils/handle-table-info-list/index.js

@@ -10,9 +10,10 @@ const handleTableInfoList = (params) => {
     const { schemaComposer, tableInfoList } = params;
     const mongooseModels = {};
     lodash_1.default.each(tableInfoList, (tableInfo) => {
-        const { name: tableName, objectInfo } = tableInfo;
-        const { modelName, mongooseModel } = (0, utils_1.getObjectTC)({
-            tableName,
+        const { collectionName, modelName, objectInfo } = tableInfo;
+        const { mongooseModel } = (0, utils_1.getObjectTC)({
+            modelName,
+            collectionName,
             objectInfo,
             schemaComposer,
         });

package/dist/utils/handle-table-info-list/utils/get-object-type-composer.d.ts

@@ -3,7 +3,8 @@ import { SchemaComposer } from "graphql-compose";
 import { ObjectTypeComposerWithMongooseResolvers } from "graphql-compose-mongoose";
 import mongoose from "mongoose";
 interface GetObjectTCParams {
-    tableName: string;
+    modelName: string;
+    collectionName: string;
     objectInfo: ObjectInfo;
     schemaComposer: SchemaComposer;
 }

package/dist/utils/handle-table-info-list/utils/get-object-type-composer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-object-type-composer.d.ts","sourceRoot":"","sources":["../../../../src/utils/handle-table-info-list/utils/get-object-type-composer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAIL,uCAAuC,EAExC,MAAM,0BAA0B,CAAC;AAMlC,OAAO,QAA8B,MAAM,UAAU,CAAC;AAiBtD,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,UAAU,cAAc;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,kBAAkB,EAAE,uCAAuC,CACzD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAChC,GAAG,CACJ,CAAC;CACH;AAED,KAAK,WAAW,GAAG,CAAC,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;AAiCjE,eAAO,MAAM,WAAW,EAAE,WAkHzB,CAAC"}
+{"version":3,"file":"get-object-type-composer.d.ts","sourceRoot":"","sources":["../../../../src/utils/handle-table-info-list/utils/get-object-type-composer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAIL,uCAAuC,EAExC,MAAM,0BAA0B,CAAC;AAMlC,OAAO,QAA8B,MAAM,UAAU,CAAC;AAiBtD,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,UAAU,cAAc;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,kBAAkB,EAAE,uCAAuC,CACzD,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAChC,GAAG,CACJ,CAAC;CACH;AAED,KAAK,WAAW,GAAG,CAAC,MAAM,EAAE,iBAAiB,KAAK,cAAc,CAAC;AAoCjE,eAAO,MAAM,WAAW,EAAE,WA8GzB,CAAC"}

package/dist/utils/handle-table-info-list/utils/get-object-type-composer.js

@@ -19,35 +19,34 @@ const countOpts = {
 };
 const buildNestedSchemaDefinition = (fieldInfoList, schemaDefinition) => {
     lodash_1.default.each(fieldInfoList, (fieldInfo) => {
-        const { name, typeInfo: { platformToTypeMap }, fieldInfoList: nestedFieldInfoList, } = fieldInfo;
+        const { name, dbKey, typeInfo: { platformToTypeMap }, fieldInfoList: nestedFieldInfoList, } = fieldInfo;
         const { COMMON, MONGOOSE } = platformToTypeMap;
         const type = MONGOOSE !== null && MONGOOSE !== void 0 ? MONGOOSE : COMMON;
-        const fieldName = lodash_1.default.camelCase(name);
-        if ((type === null || type === void 0 ? void 0 : type.type) === "object" && nestedFieldInfoList) {
+        // `dbKey` is the MongoDB field key (snake_case)
+        // `name` is the Mongoose alias / GraphQL field name (camelCase)
+        const dbFieldName = dbKey;
+        const alias = name !== dbKey ? name : undefined;
+        if (((type === null || type === void 0 ? void 0 : type.type) === "object" || (type === null || type === void 0 ? void 0 : type.type) === "array") && nestedFieldInfoList) {
             const subDef = {};
             buildNestedSchemaDefinition(nestedFieldInfoList, subDef);
-            schemaDefinition[fieldName] = new mongoose_1.default.Schema(subDef, { _id: false });
-        }
-        else if ((type === null || type === void 0 ? void 0 : type.type) === "array" && nestedFieldInfoList) {
-            const subDef = {};
-            buildNestedSchemaDefinition(nestedFieldInfoList, subDef);
-            schemaDefinition[fieldName] = [new mongoose_1.default.Schema(subDef, { _id: false })];
+            const subSchema = new mongoose_1.default.Schema(subDef, { _id: false });
+            const value = type.type === "array" ? [subSchema] : subSchema;
+            schemaDefinition[dbFieldName] = { type: value, ...(alias ? { alias } : {}) };
         }
         else {
-            schemaDefinition[fieldName] = type;
+            schemaDefinition[dbFieldName] =
+                alias && typeof type === "function" ? { type, alias } : alias ? { ...type, alias } : type;
         }
     });
 };
 const getObjectTC = (params) => {
-    const { tableName, objectInfo, schemaComposer } = params;
+    const { modelName, collectionName, objectInfo, schemaComposer } = params;
     const { fieldInfoList } = objectInfo;
     const mongooseSchemaDefinition = {};
     buildNestedSchemaDefinition(fieldInfoList, mongooseSchemaDefinition);
-    const collectionName = lodash_1.default.snakeCase(tableName);
     const mongooseSchema = new mongoose_1.default.Schema(mongooseSchemaDefinition, {
         collection: collectionName,
     });
-    const modelName = tableName;
     const mongooseModel = mongoose_1.default.models[modelName]
         ? mongoose_1.default.model(modelName)
         : mongoose_1.default.model(modelName, mongooseSchema);

package/package.json

@@ -1,24 +1,27 @@
 {
   "name": "@ldsg/tables",
-  "version": "0.3.32",
+  "version": "0.3.34",
   "description": "",
   "keywords": [],
   "license": "MIT",
   "author": "wanxger",
-  "main": "dist/index.js",
-  "types": "dist",
   "files": [
     "dist/"
   ],
+  "main": "dist/index.js",
+  "types": "dist",
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "graphql-compose-mongoose": "10.1.0",
     "lodash": "^4.17.21",
     "mongoose": "^8.14.3",
     "zod": "^4.1.11",
-    "@ldsg/field-type": "0.3.32",
-    "@ldsg/resource": "0.3.32",
-    "@ldsg/handler": "0.3.32",
-    "@ldsg/resource-definition": "0.3.32"
+    "@ldsg/handler": "0.3.34",
+    "@ldsg/resource": "0.3.34",
+    "@ldsg/resource-definition": "0.3.34",
+    "@ldsg/field-type": "0.3.34"
   },
   "devDependencies": {
     "@types/jest": "^29.5.2",
@@ -33,15 +36,12 @@
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "@ldsg/application": "0.3.32",
-    "@ldsg/graphql": "0.3.32",
-    "@ldsg/object": "0.3.32",
-    "@ldsg/object-field": "0.3.32",
-    "@ldsg/types": "0.3.32",
-    "@ldsg/workflow": "0.3.32"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@ldsg/application": "0.3.34",
+    "@ldsg/graphql": "0.3.34",
+    "@ldsg/object": "0.3.34",
+    "@ldsg/object-field": "0.3.34",
+    "@ldsg/types": "0.3.34",
+    "@ldsg/workflow": "0.3.34"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",