eddev 0.2.0-beta.36 → 0.2.0-beta.39

package/build/get-webpack-config.js

@@ -130,6 +130,7 @@ function getWebpackConfig(opts) {
                     ALIAS["@views"] = path_1.default.join(opts.baseDirectory, "views");
                     ALIAS["@hooks"] = path_1.default.join(opts.baseDirectory, "hooks");
                     ALIAS["@queries"] = path_1.default.join(opts.baseDirectory, "hooks/queries");
+                    ALIAS["@utils"] = path_1.default.join(opts.baseDirectory, "utils");
                     RULES.push({
                         test: /\.[jt]sx?$/,
                         exclude: /node_modules/,

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,34 @@ 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 (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/entry/entry.serverless.dev.js

@@ -0,0 +1,2 @@
+"use strict";
+console.log("Dev serverless");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.2.0-beta.36",
+  "version": "0.2.0-beta.39",
   "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/create-rpc-client.d.ts

@@ -1,6 +1,7 @@
+/// <reference types="react" />
 export declare function createRPCClient(): {
     Provider: ({ client, queryClient, children, isPrepass, ssrContext, }: {
-        queryClient: import("react-query").QueryClient;
+        queryClient: QueryClient;
         client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>;
         children: import("react").ReactNode;
         isPrepass?: boolean | undefined;
@@ -8,13 +9,25 @@ export declare function createRPCClient(): {
     }) => JSX.Element;
     createClient: (opts: import("@trpc/react").CreateTRPCClientOptions<import("@trpc/server").AnyRouter<any>>) => import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>;
     useContext: () => import("@trpc/react/dist/declarations/src/internals/context").TRPCContextState<import("@trpc/server").AnyRouter<any>, unknown>;
-    useQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, unknown, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => import("react-query").UseQueryResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>>;
-    useMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<unknown, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>, any> | undefined) => import("react-query").UseMutationResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>, unknown, unknown>;
+    useQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, unknown, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => UseQueryResult<{ [TPath_1 in keyof TRouter["_def"]["queries"]]: {
+        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["queries"][TPath_1]>;
+        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["queries"][TPath_1]["call"]>>;
+    }; }[TPath_2]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
+    useMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<unknown, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>, any> | undefined) => UseMutationResult<{ [TPath_3 in keyof TRouter["_def"]["mutations"]]: {
+        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["mutations"][TPath_3]>;
+        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["mutations"][TPath_3]["call"]>>;
+    }; }[TPath_1_1]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>, { [TPath_3 in keyof TRouter["_def"]["mutations"]]: {
+        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["mutations"][TPath_3]>;
+        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["mutations"][TPath_3]["call"]>>;
+    }; }[TPath_1_1]["input"], unknown>;
     useSubscription: <TPath_2 extends string, TOutput extends any>(pathAndInput: [TPath_2, (null | undefined)?], opts: {
         enabled?: boolean | undefined;
         onError?: ((err: import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>) => void) | undefined;
         onNext: (data: TOutput) => void;
     }) => void;
-    useDehydratedState: (client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>, trpcState: import("react-query").DehydratedState | undefined) => import("react-query").DehydratedState | undefined;
-    useInfiniteQuery: <TPath_3 extends never>(pathAndInput: [path: TPath_3, input: Omit<unknown, "cursor">], opts?: import("@trpc/react").UseTRPCInfiniteQueryOptions<TPath_3, Omit<unknown, "cursor">, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => import("react-query").UseInfiniteQueryResult<any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>>;
+    useDehydratedState: (client: import("@trpc/react").TRPCClient<import("@trpc/server").AnyRouter<any>>, trpcState: any) => any;
+    useInfiniteQuery: <TPath_3 extends never>(pathAndInput: [path: TPath_3, input: Omit<unknown, "cursor">], opts?: import("@trpc/react").UseTRPCInfiniteQueryOptions<TPath_3, Omit<unknown, "cursor">, any, import("@trpc/react").TRPCClientErrorLike<import("@trpc/server").AnyRouter<any>>> | undefined) => UseInfiniteQueryResult<{ [TPath_1 in keyof TRouter["_def"]["queries"]]: {
+        input: import("@trpc/server").inferProcedureInput<TRouter["_def"]["queries"][TPath_1]>;
+        output: import("@trpc/server").ThenArg<ReturnType<TRouter["_def"]["queries"][TPath_1]["call"]>>;
+    }; }[TPath_3_1]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
 };

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,11 +12,11 @@ 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

package/hooks/rpc-client.d.ts

@@ -1,3 +0,0 @@
-export declare const useRPCQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, RPCRouter, RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>> | undefined) => import("react-query").UseQueryResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>>;
-export declare const useRPCMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter> | undefined) => import("react-query").UseMutationResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter, unknown>;
-export declare const rpcClient: import("@trpc/react").TRPCClient<RPCRouter>;

package/hooks/rpc-client.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpcClient = exports.useRPCMutation = exports.useRPCQuery = void 0;
-var react_1 = require("@trpc/react");
-// @ts-ignore
-var _a = (0, react_1.createReactQueryHooks)({
-    // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
-}), useQuery = _a.useQuery, useMutation = _a.useMutation, createClient = _a.createClient;
-exports.useRPCQuery = useQuery;
-exports.useRPCMutation = useMutation;
-exports.rpcClient = createClient({
-    // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
-});

package/serverless/rpc-client.d.ts

@@ -1,3 +0,0 @@
-export declare const useRPCQuery: <TPath extends string>(pathAndInput: [TPath, (null | undefined)?], opts?: import("@trpc/react").UseTRPCQueryOptions<TPath, RPCRouter, RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>> | undefined) => import("react-query").UseQueryResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>>;
-export declare const useRPCMutation: <TPath_1 extends string>(path: TPath_1 | [TPath_1], opts?: import("@trpc/react").UseTRPCMutationOptions<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter> | undefined) => import("react-query").UseMutationResult<RPCRouter, import("@trpc/react").TRPCClientErrorLike<RPCRouter>, RPCRouter, unknown>;
-export declare const rpcClient: import("@trpc/react").TRPCClient<RPCRouter>;

package/serverless/rpc-client.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpcClient = exports.useRPCMutation = exports.useRPCQuery = void 0;
-var react_1 = require("@trpc/react");
-// @ts-ignore
-var _a = (0, react_1.createReactQueryHooks)({
-    // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
-}), useQuery = _a.useQuery, useMutation = _a.useMutation, createClient = _a.createClient;
-exports.useRPCQuery = useQuery;
-exports.useRPCMutation = useMutation;
-exports.rpcClient = createClient({
-    // @ts-ignore
-    url: process.serverlessEndpoint + "/api/trpc",
-});