@technicity/data-service-generator 0.23.0-next.12 → 0.23.0-next.13

package/dist/generation/generate.js

@@ -108,10 +108,10 @@ async function generate(input) {
         ctx.log.debug({ tableCount: tables.length, tables }, "tables after filter");
         // Process table-by-table to avoid exhausting DB connection pool (e.g. Cloud SQL limits)
         const data = (await Promise.all(tables.map((x) => Promise.all([
-            getGetOneData(x, includeMappedFields),
+            getGetOneData(x, includeMappedFields, tables),
             getGetListData(x),
             getGetListPaginatedData(x),
-            getPostOneData(x, specialCaseUuidColumn, includeMappedFields),
+            getPostOneData(x, specialCaseUuidColumn, includeMappedFields, tables),
             getPatchOneData(x, specialCaseUuidColumn, includeMappedFields),
             getPatchListData(x),
             getDeleteOneData(x),
@@ -885,16 +885,16 @@ function getTypeOrderByName(table) {
 function getTypeDataPostName(table) {
     return "DataPost" + changeCase.pascalCase(table);
 }
-async function getGetOneData(table, includeMappedFields) {
+async function getGetOneData(table, includeMappedFields, tables) {
     const typeFieldsName = getTypeFieldsName(table);
     const typeReturnBaseName = getTypeReturnBaseName(table);
     return {
         kind: "getOne",
         table,
         methodName: "get" + changeCase.pascalCase(table),
-        typeFields: await getTypeFields(table, typeFieldsName, includeMappedFields),
+        typeFields: await getTypeFields(table, typeFieldsName, includeMappedFields, tables),
         typeFieldsName,
-        typeReturnBase: await getTypeReturnBase(table, typeReturnBaseName, includeMappedFields),
+        typeReturnBase: await getTypeReturnBase(table, typeReturnBaseName, includeMappedFields, tables),
         typeReturnBaseName
     };
 }
@@ -932,7 +932,7 @@ async function getGetListPaginatedData(table) {
         typeOrderByName
     };
 }
-async function getPostOneData(table, specialCaseUuidColumn, includeMappedFields) {
+async function getPostOneData(table, specialCaseUuidColumn, includeMappedFields, tables) {
     const typeFieldsName = getTypeFieldsName(table);
     const typeReturnBaseName = getTypeReturnBaseName(table);
     const typeDataName = getTypeDataPostName(table);
@@ -942,7 +942,7 @@ async function getPostOneData(table, specialCaseUuidColumn, includeMappedFields)
         methodName: "post" + changeCase.pascalCase(table),
         typeFieldsName,
         typeReturnBaseName,
-        typeData: await getTypeDataPost(table, typeDataName, specialCaseUuidColumn, includeMappedFields),
+        typeData: await getTypeDataPost(table, typeDataName, specialCaseUuidColumn, includeMappedFields, tables),
         typeDataName
     };
 }
@@ -997,7 +997,7 @@ async function getTypeWhere(table, name) {
     const jsonSchemaWhere = await getJSONSchemaWhere(table);
     return (0, json_schema_to_typescript_1.compile)(jsonSchemaWhere, name, json2TsOpts);
 }
-async function getTypeDataPost(table, name, specialCaseUuidColumn, includeMappedFields) {
+async function getTypeDataPost(table, name, specialCaseUuidColumn, includeMappedFields, tables) {
     const primaryColumn = await getPrimaryColumn(table);
     const tableMeta = (await getTableMeta(table)).filter((x) => x.Field !== primaryColumn.name);
     const nullable = tableMeta.reduce((acc, m) => ({
@@ -1010,7 +1010,7 @@ async function getTypeDataPost(table, name, specialCaseUuidColumn, includeMapped
     }), {});
     let properties = getJSONSchemaObjProperties(tableMeta);
     let notRequiredList = [];
-    const oneToManyRelations = (await getRelationInfo(table)).filter((x) => x.type === "one-to-many__many-to-one" && x.kind === "one-to-many");
+    const oneToManyRelations = (await getRelationInfo(table, tables)).filter((x) => x.type === "one-to-many__many-to-one" && x.kind === "one-to-many");
     const mappedFields = includeMappedFields ? await getMappedFields(table) : [];
     let mappedFieldsMap = new Map();
     if (includeMappedFields) {
@@ -1391,9 +1391,9 @@ export type TUpdateOperationsNumber = {$increment: number} | {$decrement: number
 `;
     return prettier.format(src, { parser: "typescript" });
 }
-async function getTypeFields(table, name, includeMappedFields) {
+async function getTypeFields(table, name, includeMappedFields, tables) {
     const scalarKeys = Object.keys(getJSONSchemaObjProperties(await getTableMeta(table)));
-    const relations = await getRelationInfo(table);
+    const relations = await getRelationInfo(table, tables);
     const mappedFields = includeMappedFields ? await getMappedFields(table) : [];
     const keyWhere = "$where";
     const keyOrderBy = "$orderBy";
@@ -1453,10 +1453,10 @@ async function getTypeFields(table, name, includeMappedFields) {
     type = imports + "\n\n" + type;
     return type;
 }
-async function getTypeReturnBase(table, name, includeMappedFields) {
+async function getTypeReturnBase(table, name, includeMappedFields, tables) {
     const tableMeta = await getTableMeta(table);
     const scalarProperties = getJSONSchemaObjProperties(tableMeta);
-    const relations = await getRelationInfo(table);
+    const relations = await getRelationInfo(table, tables);
     const mappedFields = includeMappedFields ? await getMappedFields(table) : [];
     const jsonSchemaReturn = {
         type: "object",
@@ -1515,7 +1515,7 @@ async function getArtifacts(tables, includeMappedFields, specialCaseUuidColumn)
             getShowCreateTable(table)
         ]);
         const scalarFields = tableMeta.map((x) => x.Field);
-        const relationInfo = await getRelationInfo(table);
+        const relationInfo = await getRelationInfo(table, tables);
         const relationFields = relationInfo.reduce((acc, x) => {
             if (x.type === "one-to-many__many-to-one") {
                 acc[x.name] = {
@@ -1618,7 +1618,7 @@ async function getArtifacts(tables, includeMappedFields, specialCaseUuidColumn)
     }, {});
     return artifacts;
 }
-const getRelationInfo = (0, memoize_1.default)(async function getRelationInfo(table) {
+const getRelationInfo = (0, memoize_1.default)(async function getRelationInfo(table, tables) {
     const relationsManyToOne = await getRelationsManyToOne(table);
     const relationsOneToMany = await getRelationsOneToMany(table);
     let out = [];
@@ -1665,7 +1665,7 @@ const getRelationInfo = (0, memoize_1.default)(async function getRelationInfo(ta
         });
         return acc;
     }, []));
-    const relationsManyToMany = (await getJunctionTables()).reduce((acc, x) => {
+    const relationsManyToMany = (await getJunctionTables(tables)).reduce((acc, x) => {
         const dataForParentTable = x.relations.find((r) => r.referencedTable === table);
         if (dataForParentTable == null) {
             return acc;
@@ -1693,9 +1693,7 @@ function getRelationManyToOneFieldName(x) {
     return changeCase.camelCase(x.foreignKey.replace(new RegExp(x.referencedKey + "$", "i"), ""));
 }
 // TODO: not sure if this logic is correct
-// Note: intentionally not the filtered tables
-const getJunctionTables = (0, memoize_1.default)(async function getJunctionTables() {
-    const tables = await getTableNames();
+const getJunctionTables = (0, memoize_1.default)(async function getJunctionTables(tables) {
     return (await Promise.all(tables.map(async (table) => {
         const relations = await getRelationsManyToOne(table);
         if (relations.length === 2 &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.23.0-next.12",
+  "version": "0.23.0-next.13",
   "main": "./dist/index.js",
   "files": [
     "dist"