@technicity/data-service-generator 0.19.0 → 0.20.0

package/dist/generation/generate.js

@@ -86,7 +86,7 @@ async function generate(input) {
     ]));
     const artifacts = await getArtifacts(tables, includeMappedFields, specialCaseUuidColumn);
     const artifactsSource = getArtifactsSource(artifacts);
-    const sdkSource = await getSDKSource(data, specialCaseUuidColumn, supplementClientOpts, artifacts);
+    const sdkSource = await getSDKSource(data, specialCaseUuidColumn, supplementClientOpts, artifacts, input.outputSqliteSchema);
     const sdkFilename = "index.ts";
     const sourceIRuntimeFilePath = fs.existsSync(path.join(__dirname, "../runtime", "IRuntime.ts"))
         ? path.join(__dirname, "../runtime", "IRuntime.ts")
@@ -214,7 +214,7 @@ function init(input) {
 }
 // It's a bit awkward to put __whereNeedsProcessing, __prepareWhere on the class,
 // but it allows us to share the same database pool, clientOpts, etc.
-async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts, artifacts) {
+async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts, artifacts, outputSqliteSchema) {
     function getTypeImports() {
         let set = new Set();
         for (let d of input) {
@@ -255,7 +255,9 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
      }) {
       let otherOpts = opts.otherOpts ?? {};
       if (opts.clientOpts.filename === ":memory:") {
-        otherOpts = { ...otherOpts, createTablesString: require("./artifacts.sqlite").schema }
+        ${outputSqliteSchema === true
+        ? `otherOpts = { ...otherOpts, createTablesString: require("./artifacts.sqlite").schema }`
+        : `throw new Error("SQLite artifacts not available. Please regenerate the SDK with \`outputSqliteSchema: true\`.")`}
       }
       this.runtime = new opts.runtime(opts.clientOpts, ${supplementClientOpts === true
         ? "{ supplementClientOpts: true, ...otherOpts }"
@@ -1443,9 +1445,12 @@ const getRelationInfo = _.memoize(async function getRelationInfo(table) {
     const relationsManyToOne = await getRelationsManyToOne(table);
     const relationsOneToMany = await getRelationsOneToMany(table);
     let out = [];
-    out = out.concat(relationsManyToOne.map((x) => {
+    out = out.concat(relationsManyToOne.reduce((acc, x) => {
+        if (!x.foreignKey.endsWith("Id")) {
+            return acc;
+        }
         const name = getRelationManyToOneFieldName(x);
-        return {
+        acc.push({
             type: "one-to-many__many-to-one",
             kind: "many-to-one",
             grabMany: false,
@@ -1453,10 +1458,14 @@ const getRelationInfo = _.memoize(async function getRelationInfo(table) {
             name,
             relation: x,
             nullable: x.nullable
-        };
-    }));
+        });
+        return acc;
+    }, []));
     const relationsOneToManyDuplicates = (0, getDuplicates_1.getDuplicates)(relationsOneToMany.map((x) => x.referencedTable));
-    out = out.concat(relationsOneToMany.map((x) => {
+    out = out.concat(relationsOneToMany.reduce((acc, x) => {
+        if (!x.referencedKey.endsWith("Id")) {
+            return acc;
+        }
         let name = changeCase.camelCase(x.referencedTable) + "List";
         if (relationsOneToManyDuplicates.includes(x.referencedTable)) {
             // Examples:
@@ -1468,7 +1477,7 @@ const getRelationInfo = _.memoize(async function getRelationInfo(table) {
                     changeCase.pascalCase(x.referencedKey.replace(new RegExp(x.foreignKey + "$", "i"), "")) +
                     "List";
         }
-        return {
+        acc.push({
             type: "one-to-many__many-to-one",
             kind: "one-to-many",
             grabMany: true,
@@ -1476,8 +1485,9 @@ const getRelationInfo = _.memoize(async function getRelationInfo(table) {
             name,
             relation: x,
             nullable: x.nullable
-        };
-    }));
+        });
+        return acc;
+    }, []));
     const relationsManyToMany = (await getJunctionTables()).reduce((acc, x) => {
         const dataForParentTable = x.relations.find((r) => r.referencedTable === table);
         if (dataForParentTable == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "main": "./dist/index.js",
   "files": [
     "dist"