@technicity/data-service-generator 0.8.0 → 0.8.3

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"));
@@ -116,7 +117,7 @@ async function generate(input) {
     const sdkOutputPath = path.join(outdir, "sdk-ts");
     const nccVersion = "^0.33.0";
     child_process.execSync("npm i", { cwd: tmpDirPath, stdio: "inherit" });
-    child_process.execSync(`npx --yes -p @vercel/ncc@${nccVersion} ncc build ./${sdkFilename} -o ${tmpBuildOutputPath} -e ./artifacts`, { cwd: tmpDirPath, stdio: "inherit" });
+    child_process.execSync(`npm_config_yes=true npx -p @vercel/ncc@${nccVersion} ncc build ./${sdkFilename} -o ${tmpBuildOutputPath} -e ./artifacts`, { cwd: tmpDirPath, stdio: "inherit" });
     // TODO: workaround for artifacts.js not being output by ncc
     fs.writeFileSync(path.join(tmpBuildOutputPath, "artifacts.js"), artifactsSource
         .replace("export const artifacts: IArtifacts = ", "module.exports.artifacts = ")
@@ -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;
@@ -223,6 +228,10 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts)
       return this.runtime.$queryRaw(sql, values);
     }
 
+    async $shutdown() {
+      return this.runtime.$shutdown();
+    }
+
     ${(await Promise.all(input.flatMap(async (x) => {
         let findOnes = [];
         const primaryColumn = await getPrimaryColumn(x.table);
@@ -834,6 +843,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/dist/runtime/IRuntime.d.ts

@@ -4,6 +4,7 @@ export interface IRuntime {
     $use: (middleware: TMiddleware) => void;
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<any>;
+    $shutdown(): Promise<void>;
 }
 export declare type TResolveParams = {
     resource: string;

package/dist/runtime/RuntimeKSQL.d.ts

@@ -14,5 +14,6 @@ export declare class RuntimeKSQL implements IRuntime {
     $use(middleware: TMiddleware): Promise<void>;
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<{}>;
+    $shutdown(): Promise<void>;
 }
 export {};

package/dist/runtime/RuntimeKSQL.js

@@ -57,6 +57,9 @@ class RuntimeKSQL {
     async $prepareWhere(artifacts, table, data) {
         return (0, shared_1._prepareWhere)(artifacts, table, data, __classPrivateFieldGet(this, _RuntimeKSQL_dbCall, "f").bind(this), __classPrivateFieldGet(this, _RuntimeKSQL_formatQuery, "f").bind(this));
     }
+    async $shutdown() {
+        // Nothing to do here, I think
+    }
 }
 exports.RuntimeKSQL = RuntimeKSQL;
 _RuntimeKSQL_ksql = new WeakMap(), _RuntimeKSQL_middlewareHandler = new WeakMap(), _RuntimeKSQL_dbCall = new WeakMap(), _RuntimeKSQL_formatQuery = new WeakMap(), _RuntimeKSQL_getBaseTableName = new WeakMap(), _RuntimeKSQL_getMaterializedViewName = new WeakMap(), _RuntimeKSQL_doNotUseMaterializedViews = new WeakMap();

package/dist/runtime/RuntimeMSSQL.d.ts

@@ -12,6 +12,7 @@ export declare class RuntimeMSSQL implements IRuntime {
     $use(middleware: TMiddleware): Promise<void>;
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<{}>;
+    $shutdown(): Promise<void>;
     private dbCall;
     private formatQuery;
     private beginTransaction;

package/dist/runtime/RuntimeMSSQL.js

@@ -41,6 +41,9 @@ class RuntimeMSSQL {
     async $prepareWhere(artifacts, table, data) {
         return (0, shared_1._prepareWhere)(artifacts, table, data, this.dbCall.bind(this), this.formatQuery.bind(this));
     }
+    async $shutdown() {
+        await __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").closePool();
+    }
     async dbCall(q) {
         return __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").dbCall(q);
     }

package/dist/runtime/RuntimeMySQL.d.ts

@@ -11,6 +11,7 @@ export declare class RuntimeMySQL implements IRuntime {
     $use(middleware: TMiddleware): Promise<void>;
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<{}>;
+    $shutdown(): Promise<void>;
     private dbCall;
     private formatQuery;
     private beginTransaction;

package/dist/runtime/RuntimeMySQL.js

@@ -78,6 +78,9 @@ class RuntimeMySQL {
     async $prepareWhere(artifacts, table, data) {
         return (0, shared_1._prepareWhere)(artifacts, table, data, this.dbCall.bind(this), this.formatQuery.bind(this));
     }
+    async $shutdown() {
+        await __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").endPool();
+    }
     dbCall(q) {
         return __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").query(q);
     }

package/dist/runtime/lib/MSSQL.d.ts

@@ -9,4 +9,5 @@ export declare class MSSQL {
         commit: () => Promise<void>;
         dbCall: (q: string) => Promise<any>;
     }>;
+    closePool(): Promise<void>;
 }

package/dist/runtime/lib/MSSQL.js

@@ -65,6 +65,9 @@ class MSSQL {
                 .catch(handleError),
         };
     }
+    async closePool() {
+        await __classPrivateFieldGet(this, _MSSQL_pool, "f").close();
+    }
 }
 exports.MSSQL = MSSQL;
 _MSSQL_pool = new WeakMap(), _MSSQL_poolConnect = new WeakMap(), _MSSQL_typeCast = new WeakMap();

package/dist/runtime/lib/MySQL.d.ts

@@ -4,4 +4,5 @@ export declare class MySQL {
     query(...args: any[]): any;
     beginTransaction(): Promise<any>;
     getConnection(): Promise<any>;
+    endPool(): Promise<void>;
 }

package/dist/runtime/lib/MySQL.js

@@ -32,5 +32,8 @@ class MySQL {
             .getConnectionAsync()
             .disposer((connection) => connection.release());
     }
+    async endPool() {
+        await this.pool.endAsync();
+    }
 }
 exports.MySQL = MySQL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.8.0",
+  "version": "0.8.3",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -9,7 +9,9 @@
     "compile": "rm -rf dist && tsc",
     "create-database": "env-cmd node ./test/mysql/create-database.js && env-cmd node ./test/mysql8/create-database.js && env-cmd node ./test/mssql/create-database.js",
     "generate": "npm run compile && npm run create-database && env-cmd node ./test/mysql/generate.js && env-cmd node ./test/mysql8/generate.js && env-cmd node ./test/mssql/generate.js",
-    "test": "npm run generate && env-cmd mocha ./test/addNullFallbacks.test.js && env-cmd mocha ./test/stringifyWhere.test.js && env-cmd mocha ./test/test.js"
+    "test": "npm run generate && env-cmd mocha ./test/addNullFallbacks.test.js && env-cmd mocha ./test/stringifyWhere.test.js && npm run test:sdk",
+    "test:sdk": "env-cmd mocha ./test/test.js",
+    "test:only": "npm run create-database && npm run test:sdk"
   },
   "dependencies": {
     "bluebird": "^3.7.2",