feat: db pull implementation #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

svetch wants to merge 68 commits into zenstackhq:dev from svetch:main

+4,492 −61

packages/cli/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,9 @@ @@
             "./package.json": "./package.json"
         },
         "dependencies": {
+            "@dotenvx/dotenvx": "^1.51.0",
             "@zenstackhq/common-helpers": "workspace:*",
+            "@zenstackhq/schema": "workspace:*",
             "@zenstackhq/language": "workspace:*",
             "@zenstackhq/orm": "workspace:*",
             "@zenstackhq/sdk": "workspace:*",
@@ Expand Down @@

packages/cli/src/actions/action-utils.ts

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
-    import { loadDocument } from '@zenstackhq/language';
-    import { isDataSource } from '@zenstackhq/language/ast';
+    import { type ZModelServices, loadDocument } from '@zenstackhq/language';
+    import { type Model, isDataSource } from '@zenstackhq/language/ast';
     import { PrismaSchemaGenerator } from '@zenstackhq/sdk';
     import colors from 'colors';
     import fs from 'node:fs';
@@ Expand Down Expand Up / @@ -41,8 +41,22 @@ export function getSchemaFile(file?: string) { @@
         }
     }
-    export async function loadSchemaDocument(schemaFile: string) {
-        const loadResult = await loadDocument(schemaFile);
+    export async function loadSchemaDocument(
+        schemaFile: string,
+        opts?: { keepImports?: boolean; returnServices?: false },
+    ): Promise<Model>;
+    export async function loadSchemaDocument(
+        schemaFile: string,
+        opts: { returnServices: true; keepImports?: boolean },
+    ): Promise<{ model: Model; services: ZModelServices }>;
+    export async function loadSchemaDocument(
+        schemaFile: string,
+        opts: { returnServices?: boolean; keepImports?: boolean } = {},
+    ) {
+        const returnServices = opts.returnServices || false;
+        const keepImports = opts.keepImports || false;
+        const loadResult = await loadDocument(schemaFile, [], keepImports);
         if (!loadResult.success) {
             loadResult.errors.forEach((err) => {
                 console.error(colors.red(err));
@@ Expand All @@
         loadResult.warnings.forEach((warn) => {
             console.warn(colors.yellow(warn));
         });
+        if (returnServices) return { model: loadResult.model, services: loadResult.services };
         return loadResult.model;
     }
@@ Expand Down @@

packages/cli/src/actions/db.ts

Large diffs are not rendered by default.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: db pull implementation #268

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

feat: db pull implementation #268

Are you sure you want to change the base?

feat: db pull implementation #268

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!