@zenstackhq/sdk 3.0.0-beta.24 → 3.0.0-beta.26

package/dist/index.d.cts

@@ -139,6 +139,8 @@ declare class TsSchemaGenerator {
     private createSchemaObject;
     private createProviderObject;
     private createModelsObject;
+    private getAllDataModels;
+    private getAllTypeDefs;
     private createTypeDefsObject;
     private createDataModelObject;
     private getSubModels;

package/dist/index.d.ts

@@ -139,6 +139,8 @@ declare class TsSchemaGenerator {
     private createSchemaObject;
     private createProviderObject;
     private createModelsObject;
+    private getAllDataModels;
+    private getAllTypeDefs;
     private createTypeDefsObject;
     private createDataModelObject;
     private getSubModels;

package/dist/index.js

@@ -90,7 +90,7 @@ __name(resolved, "resolved");
 function getAuthDecl(model) {
   let found = model.declarations.find((d) => (isDataModel(d) || isTypeDef(d)) && d.attributes.some((attr) => attr.decl.$refText === "@@auth"));
   if (!found) {
-    found = model.declarations.find((d) => isDataModel(d) && d.name === "User");
+    found = model.declarations.find((d) => (isDataModel(d) || isTypeDef(d)) && d.name === "User");
   }
   return found;
 }
@@ -943,10 +943,16 @@ var TsSchemaGenerator = class {
     ], true);
   }
   createModelsObject(model, lite) {
-    return ts.factory.createObjectLiteralExpression(model.declarations.filter((d) => isDataModel3(d) && !hasAttribute(d, "@@ignore")).map((dm) => ts.factory.createPropertyAssignment(dm.name, this.createDataModelObject(dm, lite))), true);
+    return ts.factory.createObjectLiteralExpression(this.getAllDataModels(model).map((dm) => ts.factory.createPropertyAssignment(dm.name, this.createDataModelObject(dm, lite))), true);
+  }
+  getAllDataModels(model) {
+    return model.declarations.filter((d) => isDataModel3(d) && !hasAttribute(d, "@@ignore"));
+  }
+  getAllTypeDefs(model) {
+    return model.declarations.filter((d) => isTypeDef3(d) && !hasAttribute(d, "@@ignore"));
   }
   createTypeDefsObject(model, lite) {
-    return ts.factory.createObjectLiteralExpression(model.declarations.filter((d) => isTypeDef3(d)).map((td) => ts.factory.createPropertyAssignment(td.name, this.createTypeDefObject(td, lite))), true);
+    return ts.factory.createObjectLiteralExpression(this.getAllTypeDefs(model).map((td) => ts.factory.createPropertyAssignment(td.name, this.createTypeDefObject(td, lite))), true);
   }
   createDataModelObject(dm, lite) {
     const allFields = getAllFields3(dm);
@@ -1056,6 +1062,9 @@ var TsSchemaGenerator = class {
     if (hasAttribute(field, "@updatedAt")) {
       objectFields.push(ts.factory.createPropertyAssignment("updatedAt", ts.factory.createTrue()));
     }
+    if (hasAttribute(field, "@omit")) {
+      objectFields.push(ts.factory.createPropertyAssignment("omit", ts.factory.createTrue()));
+    }
     if (contextModel && // id fields are duplicated in inherited models
     !isIdField(field, contextModel) && field.$container !== contextModel && isDelegateModel(field.$container)) {
       objectFields.push(ts.factory.createPropertyAssignment("originModel", ts.factory.createStringLiteral(field.$container.name)));
@@ -1511,7 +1520,7 @@ var TsSchemaGenerator = class {
         ts.factory.createImportSpecifier(true, void 0, ts.factory.createIdentifier(`TypeDefResult as $TypeDefResult`))
       ] : []
     ])), ts.factory.createStringLiteral("@zenstackhq/orm")));
-    const dataModels = model.declarations.filter(isDataModel3);
+    const dataModels = this.getAllDataModels(model);
     for (const dm of dataModels) {
       let modelType = ts.factory.createTypeAliasDeclaration([
         ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)
@@ -1524,7 +1533,7 @@ var TsSchemaGenerator = class {
       }
       statements.push(modelType);
     }
-    const typeDefs = model.declarations.filter(isTypeDef3);
+    const typeDefs = this.getAllTypeDefs(model);
     for (const td of typeDefs) {
       let typeDef = ts.factory.createTypeAliasDeclaration([
         ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)
@@ -1585,7 +1594,7 @@ var TsSchemaGenerator = class {
  `, true);
   }
   generateInputTypes(model, options) {
-    const dataModels = model.declarations.filter(isDataModel3);
+    const dataModels = this.getAllDataModels(model);
     const statements = [];
     statements.push(this.generateSchemaImport(model, false, true, !!(options.lite || options.liteOnly), options.importWithFileExtension));
     const inputTypes = [
@@ -1614,7 +1623,10 @@ var TsSchemaGenerator = class {
       IncludeInput: "Include",
       OmitInput: "Omit"
     };
-    statements.push(ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(true, void 0, ts.factory.createNamedImports(inputTypes.map((inputType) => ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier(`${inputType} as $${inputType}`))))), ts.factory.createStringLiteral("@zenstackhq/orm")));
+    statements.push(ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(true, void 0, ts.factory.createNamedImports([
+      ...inputTypes.map((inputType) => ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier(`${inputType} as $${inputType}`))),
+      ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier("ClientOptions as $ClientOptions"))
+    ])), ts.factory.createStringLiteral("@zenstackhq/orm")));
     statements.push(ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(true, void 0, ts.factory.createNamedImports([
       ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier("SimplifiedModelResult as $SimplifiedModelResult")),
       ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier("SelectIncludeOmit as $SelectIncludeOmit"))
@@ -1636,10 +1648,16 @@ var TsSchemaGenerator = class {
           ts.factory.createTypeReferenceNode("$Schema"),
           ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(dm.name)),
           ts.factory.createLiteralTypeNode(ts.factory.createTrue())
+        ])),
+        ts.factory.createTypeParameterDeclaration(void 0, "Options", ts.factory.createTypeReferenceNode("$ClientOptions", [
+          ts.factory.createTypeReferenceNode("$Schema")
+        ]), ts.factory.createTypeReferenceNode("$ClientOptions", [
+          ts.factory.createTypeReferenceNode("$Schema")
         ]))
       ], ts.factory.createTypeReferenceNode("$SimplifiedModelResult", [
         ts.factory.createTypeReferenceNode("$Schema"),
         ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(dm.name)),
+        ts.factory.createTypeReferenceNode("Options"),
         ts.factory.createTypeReferenceNode("Args")
       ])));
     }