@snowtop/ent 0.1.0-alpha108 → 0.1.0-alpha110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha108",
+  "version": "0.1.0-alpha110",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/parse_schema/parse.js

@@ -199,9 +199,13 @@ function processAction(action) {
             if (f.nullable === "contentsAndList") {
                 f2.nullable = NullableResult.CONTENTS_AND_LIST;
             }
-            else {
+            else if (f.nullable === "contents") {
                 f2.nullable = NullableResult.CONTENTS;
             }
+            else if (f.nullable === "true") {
+                // shouldn't happen but ran into weirdness where it did...
+                f2.nullable = NullableResult.ITEM;
+            }
         }
         return f2;
     });

package/schema/index.d.ts

@@ -1,6 +1,6 @@
 import Schema from "./schema";
 export { Schema };
-export { Field, AssocEdge, AssocEdgeGroup, InverseAssocEdge, Edge, Pattern, DBType, Type, FieldOptions, SchemaConstructor, SchemaInputType, getFields, getFieldsWithPrivacy, getStorageKey, ActionOperation, Action, EdgeAction, NoFields, FieldMap, Constraint, Index, ConstraintType, ForeignKeyInfo, requiredField, optionalField, UpdateOperation, TransformedUpdateOperation, SQLStatementOperation, EdgeUpdateOperation, TransformedEdgeUpdateOperation, getTransformedReadClause, getObjectLoaderProperties, GlobalSchema, } from "./schema";
+export { Field, AssocEdge, AssocEdgeGroup, InverseAssocEdge, Edge, Pattern, DBType, Type, FieldOptions, SchemaConstructor, SchemaInputType, getFields, getFieldsWithPrivacy, getStorageKey, ActionOperation, Action, EdgeAction, NoFields, FieldMap, Constraint, Index, ConstraintType, ForeignKeyInfo, requiredField, optionalField, UpdateOperation, TransformedUpdateOperation, SQLStatementOperation, EdgeUpdateOperation, TransformedEdgeUpdateOperation, getTransformedReadClause, getObjectLoaderProperties, GlobalSchema, ActionField, } from "./schema";
 export { Timestamps, Node, BaseEntSchema, BaseEntSchemaWithTZ, EntSchema, EntSchemaWithTZ, SchemaConfig, } from "./base_schema";
 export * from "./field";
 export * from "./json_field";

package/schema/schema.d.ts

@@ -264,6 +264,7 @@ export interface ActionField {
     name: string;
     type: actionFieldType;
     nullable?: boolean | NullableListOptions;
+    optional?: boolean;
     list?: boolean;
     actionName?: string;
     excludedFields?: string[];

package/schema/schema.js

@@ -160,6 +160,9 @@ function getTransformedReadClause(value) {
     return;
 }
 exports.getTransformedReadClause = getTransformedReadClause;
+// would like to avoid calling this so that itwe don't run into circular dependencies
+// but the fact that it returns a clause makes it hard since we don't control the patterns...
+// we can make each clause return a format that can be extrapolated and used in codegen...
 function getObjectLoaderProperties(value, tableName) {
     return {
         clause: () => getTransformedReadClause(value),

package/testutils/db/temp_db.js

@@ -463,6 +463,9 @@ class TempDB {
     async afterAll() {
         if (this.dialect === db_1.Dialect.SQLite) {
             this.sqlite.close();
+            if (!this.sqlite.memory) {
+                fs.rmSync(this.getSqliteClient().name);
+            }
             return;
         }
         // end our connection to db
@@ -554,7 +557,6 @@ function setupSqlite(connString, tables, opts) {
     }
     afterAll(async () => {
         await tdb.afterAll();
-        fs.rmSync(tdb.getSqliteClient().name);
         delete process.env.DB_CONNECTION_STRING;
     });
     return tdb;