@snowtop/ent 0.1.0-alpha34 → 0.1.0-alpha35

package/package.json

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

package/tsc/transform_schema.js

@@ -91,7 +91,7 @@ function getTransformClassInfo(fileContents, sourceFile, node, transformSchema)
 }
 // intentionally doesn't parse decorators since we don't need it
 function getClassElementInfo(fileContents, member, sourceFile) {
-    if (isFieldElement(member, sourceFile)) {
+    if (isFieldElement(fileContents, member, sourceFile)) {
         return getFieldElementInfo(fileContents, member, sourceFile);
     }
     if (member.kind === typescript_1.default.SyntaxKind.Constructor) {
@@ -201,7 +201,7 @@ function getConstructorElementInfo(fileContents, member, sourceFile) {
         comment: "",
     };
 }
-function isFieldElement(member, sourceFile) {
+function isFieldElement(fileContents, member, sourceFile) {
     if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
         return false;
     }
@@ -215,16 +215,31 @@ function isFieldElement(member, sourceFile) {
         return false;
     }
     if (property.initializer?.kind !== typescript_1.default.SyntaxKind.ArrayLiteralExpression) {
-        console.error("invalid array type");
+        throwErr(fileContents, member, "invalid array type");
         return false;
     }
     return true;
 }
+// if there's an error transforming any of the schemas, we should stop...
+function throwErr(fileContents, node, error) {
+    console.error(error);
+    throw new Error(`error transforming this field ${fileContents.substring(node.getFullStart(), node.getEnd())}`);
+}
 function parseFieldElement(element, sourceFile, fileContents, nested) {
-    if (element.kind !== typescript_1.default.SyntaxKind.CallExpression) {
-        console.error("skipped non-call expression");
+    if (element.kind !== typescript_1.default.SyntaxKind.CallExpression &&
+        element.kind !== typescript_1.default.SyntaxKind.PropertyAccessExpression) {
+        throwErr(fileContents, element, `skipped unknown (non-call|non-property) expression ${element.kind}`);
         return null;
     }
+    if (element.kind === typescript_1.default.SyntaxKind.PropertyAccessExpression) {
+        const ret = parseFieldElement(element.expression, sourceFile, fileContents, true);
+        if (ret !== null) {
+            if (!nested) {
+                ret.suffix = fileContents.substring(ret.callEx.getEnd(), element.getEnd());
+            }
+            return ret;
+        }
+    }
     let callEx = element;
     if (callEx.arguments.length !== 1) {
         // have a situation like:     StringType({ name: "canonicalName" }).trim().toLowerCase(),
@@ -238,12 +253,22 @@ function parseFieldElement(element, sourceFile, fileContents, nested) {
                 return ret;
             }
         }
-        console.error("callExpression with arguments not of length 1");
-        return null;
+        throwErr(fileContents, element, "callExpression with arguments not of length 1");
     }
     let arg = callEx.arguments[0];
     if (arg.kind !== typescript_1.default.SyntaxKind.ObjectLiteralExpression) {
-        console.error("not objectLiteralExpression");
+        // this and the check above for PropertyAccessExpression are to handle things like
+        // FooType({
+        /// ...
+        // }).function(blah)
+        const ret = parseFieldElement(callEx.expression, sourceFile, fileContents, true);
+        if (ret !== null) {
+            if (!nested) {
+                ret.suffix = fileContents.substring(ret.callEx.getEnd(), callEx.getEnd());
+            }
+            return ret;
+        }
+        throwErr(fileContents, element, `not objectLiteralExpression. kind ${arg.kind}`);
         return null;
     }
     let expr = arg;
@@ -263,7 +288,7 @@ function parseFieldElement(element, sourceFile, fileContents, nested) {
         }
     }
     if (!name) {
-        console.error(`couldn't find name property`);
+        throwErr(fileContents, element, `couldn't find name property`);
         return null;
     }
     // remove quotes