@snowtop/ent 0.0.27 → 0.0.28-alpha

package/imports/index.d.ts

@@ -10,7 +10,7 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomInput(filePath: string, opts?: Options): PathResult;
+export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
 export declare function findTSConfigFile(filePath: string): string | null;
 export interface importInfo {
     name: string;

package/imports/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTSConfigFile = exports.parseCustomInput = void 0;
+exports.findTSConfigFile = exports.parseCustomImports = void 0;
 const glob_1 = __importDefault(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
 const json5_1 = __importDefault(require("json5"));
@@ -42,10 +42,9 @@ function getFiles(filePath, opts) {
     }
     return files;
 }
-function parseCustomInput(filePath, opts) {
+function parseCustomImports(filePath, opts) {
     const files = getFiles(filePath, opts);
     const options = readCompilerOptions(filePath);
-    // classMap
     let classMap = new Map();
     files.forEach((file) => {
         const sourceFile = typescript_1.default.createSourceFile(file, fs.readFileSync(file).toString(), options.target || typescript_1.default.ScriptTarget.ES2015);
@@ -77,7 +76,7 @@ function parseCustomInput(filePath, opts) {
         },
     };
 }
-exports.parseCustomInput = parseCustomInput;
+exports.parseCustomImports = parseCustomImports;
 function findTSConfigFile(filePath) {
     while (filePath != "/") {
         let configPath = `${filePath}/tsconfig.json`;
@@ -95,7 +94,6 @@ function readCompilerOptions(filePath) {
     if (!configPath) {
         return {};
     }
-    const root = path.join(filePath, "..");
     let json = {};
     try {
         json = json5_1.default.parse(fs.readFileSync(configPath, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.27",
+  "version": "0.0.28-alpha",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/scripts/custom_graphql.js

@@ -52,7 +52,17 @@ async function readInputs() {
         });
     });
 }
-async function captureCustom(filePath) {
+async function captureCustom(filePath, filesCsv) {
+    if (filesCsv !== undefined) {
+        let files = filesCsv.split(",");
+        for (let i = 0; i < files.length; i++) {
+            // TODO fix. we have "src" in the path we get here
+            files[i] = path.join(filePath, "..", files[i]);
+        }
+        await requireFiles(files);
+        return;
+    }
+    // TODO delete all of this eventually
     // TODO configurable paths eventually
     // for now only files that are in the include path of the roots are allowed
     const rootFiles = [
@@ -81,18 +91,28 @@ async function captureCustom(filePath) {
         ignore: ignore,
     });
     const files = rootFiles.concat(customGQLResolvers, customGQLMutations);
-    //console.log(files);
-    let promises = [];
-    files.forEach((file) => {
+    await requireFiles(files);
+}
+async function requireFiles(files) {
+    await Promise.all(files.map(async (file) => {
         if (fs.existsSync(file)) {
-            promises.push(require(file));
+            try {
+                await require(file);
+            }
+            catch (e) {
+                throw new Error(`${e.message} loading ${file}`);
+            }
+        }
+        else {
+            throw new Error(`file ${file} doesn't exist`);
         }
+    })).catch((err) => {
+        throw new Error(err);
     });
-    await Promise.all(promises);
 }
 async function parseImports(filePath) {
     // only do graphql files...
-    return (0, imports_1.parseCustomInput)(path.join(filePath, "graphql"), {
+    return (0, imports_1.parseCustomImports)(path.join(filePath, "graphql"), {
         ignore: ["**/generated/**", "**/tests/**"],
     });
 }
@@ -126,7 +146,7 @@ async function main() {
     GQLCapture.enable(true);
     const [inputsRead, _, imports] = await Promise.all([
         readInputs(),
-        captureCustom(options.path),
+        captureCustom(options.path, options.files),
         parseImports(options.path),
     ]);
     const { nodes, nodesMap } = inputsRead;