eddev 0.2.0-beta.35 → 0.2.0-beta.38

package/build/serverless/create-next-app.js

@@ -339,7 +339,6 @@ function writeAPIProxies(sourceFolder, targetFolder) {
 function syncAPIProxies(sourceFolder, targetFolder) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            console.log("Syncing files", sourceFolder, targetFolder);
             return [2 /*return*/, syncFiles(sourceFolder, targetFolder, ["**/*"], function (inputPath) {
                     if (inputPath.includes("_rpc"))
                         return null;

package/build/workers/codegen-worker-script.js

@@ -150,6 +150,7 @@ function beginWork(opts) {
                                 schemaDescription: false,
                                 specifiedByUrl: true,
                             });
+                            processSchema(schema);
                             hash = JSON.stringify(schema);
                             if (hash !== lastSchemaHash) {
                                 lastSchemaHash = hash;
@@ -577,4 +578,37 @@ function debounce(wait, fn) {
     };
     return debounced;
 }
+function processSchema(schema) {
+    var walkFields = function (fields) { };
+    var updateFieldType = function (fieldType) {
+        var _a;
+        if (fieldType.kind === "LIST") {
+            if (((_a = fieldType.ofType) === null || _a === void 0 ? void 0 : _a.kind) !== "NON_NULL") {
+                fieldType.ofType = {
+                    kind: "NON_NULL",
+                    name: null,
+                    ofType: fieldType.ofType,
+                };
+            }
+        }
+    };
+    var updateType = function (type) {
+        if (type.name === "valuesOptional") {
+            console.log(type);
+        }
+        if (typeof type.type === "object" && type.type) {
+            updateFieldType(type.type);
+        }
+        if (type.fields) {
+            for (var _i = 0, _a = type.fields; _i < _a.length; _i++) {
+                var field = _a[_i];
+                updateType(field);
+            }
+        }
+    };
+    for (var _i = 0, _a = schema.__schema.types; _i < _a.length; _i++) {
+        var type = _a[_i];
+        updateType(type);
+    }
+}
 beginWork(worker_threads_1.workerData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.0-beta.35",
+  "version": "0.2.0-beta.38",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -27,7 +27,7 @@
     "@types/url-parse": "^1.4.4",
     "@types/webpack-dev-server": "^3.11.2",
     "csstype": "^3.0.9",
-    "next": "12.0.10",
+    "next": "^12.1.0",
     "react-html-props": "^1.0.32"
   },
   "dependencies": {

package/serverless/define-rpc-router.d.ts

@@ -1,4 +1,6 @@
 import * as trpc from "@trpc/server";
 import * as trpcNext from "@trpc/server/adapters/next";
-export declare function defineRPC<TCreator extends (base: ReturnType<typeof trpc.router>, z: typeof import("zod")) => any>(creator: TCreator): ReturnType<TCreator>;
+declare const createRouter: () => import("@trpc/server/dist/declarations/src/router").Router<RPCContextType, RPCContextType, {}, {}, {}, trpc.DefaultErrorShape>;
+export declare function defineRPC<TCreator extends (base: ReturnType<typeof createRouter>, z: typeof import("zod")) => any>(creator: TCreator): ReturnType<TCreator>;
 export declare function defineRPCContextCreator<TCreator extends (opts: trpcNext.CreateNextContextOptions) => any>(creator: TCreator): TCreator;
+export {};

package/serverless/define-rpc-router.js

@@ -23,6 +23,8 @@ exports.defineRPCContextCreator = exports.defineRPC = void 0;
 var trpc = __importStar(require("@trpc/server"));
 var z = __importStar(require("zod"));
 // @ts-ignore
+var createRouter = function () { return trpc.router(); };
+// @ts-ignore
 function defineRPC(creator) {
     return creator(trpc.router(), z);
 }

package/serverless-template/package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "@types/react": "17.0.39",
     "typescript": "4.5.5",
-    "next": "12.0.10"
+    "next": "^12.1.0"
   }
 }

package/serverless-template/pages/api/trpc/[...trpc].ts

@@ -12,18 +12,15 @@ export default function (req: NextApiRequest, res: NextApiResponse) {
   // TODO: Use an origin whitelist
   const origin = req.headers.origin
   if (origin) {
+    res.setHeader("Access-Control-Allow-Origin", "*")
+    res.setHeader("Access-Control-Request-Method", "*")
+    res.setHeader("Access-Control-Request-Method", "OPTIONS, GET, POST")
+    res.setHeader("Access-Control-Allow-Headers", "*")
     if (req.method === "OPTIONS") {
-      res.setHeader("Access-Control-Allow-Origin", "*")
-      res.setHeader("Access-Control-Request-Method", "*")
-      res.setHeader("Access-Control-Request-Method", "OPTIONS, GET, POST")
-      res.setHeader("Access-Control-Allow-Headers", "*")
       res.writeHead(200)
       res.end()
       return
     }
   }
-  // res.writeHead(200)
-  res.json("Test")
-  return
-  // return handler(req, res)
+  return handler(req, res)
 }