@technicity/data-service-generator 0.8.0 → 0.8.1

package/dist/generation/generate.js

@@ -108,6 +108,7 @@ async function generate(input) {
             fs.writeFileSync(path.join(typesDirPath, x.typeDataName + ".ts"), x.typeData);
         }
     }
+    fs.writeFileSync(path.join(typesDirPath, "index.ts"), getTypeTypesIndex(data));
     fs.writeFileSync(path.join(tmpDirPath, "package.json"), JSON.stringify(packageJSON, null, 2));
     fs.writeFileSync(path.join(tmpDirPath, "tsconfig.json"), JSON.stringify(tsConfigJSON, null, 2));
     fse.copySync(__dirname, path.join(tmpDirPath, "src"));
@@ -169,26 +170,30 @@ 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) {
+    function getTypeImports() {
+        let set = new Set();
+        for (let d of input) {
+            for (let k of [
+                "typeFieldsName",
+                "typeReturnBaseName",
+                "typeWhereName",
+                "typeOrderByName",
+                "typeDataName",
+            ]) {
+                const str = d[k];
+                if (str) {
+                    set.add(str);
+                }
+            }
+        }
+        return `import type { ${["Paginate", "ListPaginated"]
+            .concat(Array.from(set).sort())
+            .join(",\n")} } from "./types";`;
+    }
     const src = `import type { IRuntime, TMiddleware, TContext } from "./IRuntime"
   import { artifacts } from "./artifacts";
-  import type { Paginate, ListPaginated } from "./types/_shared";
-  ${input.reduce((acc, x) => {
-        if (x.kind === "getOne") {
-            acc += `import type { ${x.typeReturnBaseName} } from "./types/${x.typeReturnBaseName}";`;
-            acc += `import type { ${x.typeFieldsName} } from "./types/${x.typeFieldsName}";`;
-        }
-        if (x.kind === "getList") {
-            acc += `import type { ${x.typeWhereName} } from "./types/${x.typeWhereName}";`;
-            acc += `import type { ${x.typeOrderByName} } from "./types/${x.typeOrderByName}";`;
-        }
-        if (x.kind === "postOne") {
-            acc += `import type { ${x.typeDataName} } from "./types/${x.typeDataName}";`;
-        }
-        if (x.kind === "patchOne") {
-            acc += `import type { ${x.typeDataName} } from "./types/${x.typeDataName}";`;
-        }
-        return acc;
-    }, "")}
+
+  ${getTypeImports()}
 
   export class SDK {
     runtime: IRuntime;
@@ -834,6 +839,37 @@ async function getJSONSchemaOrderBy(table, name) {
         oneOf: [_schema, { type: "array", items: _schema }],
     };
 }
+function getTypeTypesIndex(data) {
+    function getExport(name) {
+        return `export type { ${name} } from "./${name}";`;
+    }
+    let set = new Set();
+    for (let d of data) {
+        for (let k of [
+            "typeFieldsName",
+            "typeReturnBaseName",
+            "typeWhereName",
+            "typeOrderByName",
+            "typeDataName",
+        ]) {
+            const str = d[k];
+            if (str) {
+                set.add(str);
+            }
+        }
+    }
+    let src = `export type { ${[
+        "Paginate",
+        "ListPaginated",
+        "TUpdateOperationsString",
+        "TUpdateOperationsNumber",
+    ].join(",")} } from "./_shared";\n\n`;
+    let arr = Array.from(set).sort();
+    for (let x of arr) {
+        src += getExport(x);
+    }
+    return prettier.format(src, { parser: "typescript" });
+}
 function getTypeShared() {
     const src = `export type Paginate = {
     first: number;

package/package.json

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