@wasp.sh/wasp-cli-darwin-arm64-unknown 0.24.0 → 0.25.0

package/data/packages/spec/dist/__tests__/spec-pipeline/pipeline.integration.test.js

@@ -111,7 +111,7 @@ describe("Wasp TS spec pipeline", () => {
             __disposeResources(env_1);
         }
     });
-    test("surfaces type errors in the spec as a SpecUserError with formatted diagnostics", () => {
+    test("surfaces type errors in the spec as a WaspSpecUserError with formatted diagnostics", () => {
         const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const project = __addDisposableResource(env_2, makeTempProject("wasp-spec-pipeline-type-error-"), false);
@@ -140,10 +140,41 @@ describe("Wasp TS spec pipeline", () => {
             __disposeResources(env_2);
         }
     });
-    test("rejects namespace ref imports with a SpecUserError", () => {
+    test("surfaces a WaspSpecUserError thrown by the user's spec as a clean error", () => {
         const env_3 = { stack: [], error: void 0, hasError: false };
         try {
-            const project = __addDisposableResource(env_3, makeTempProject("wasp-spec-pipeline-namespace-"), false);
+            const project = __addDisposableResource(env_3, makeTempProject("wasp-spec-pipeline-user-error-"), false);
+            const result = project.analyzeSpec([
+                `import { app, WaspSpecUserError } from "@wasp.sh/spec";`,
+                ``,
+                `function requireEnv(name: string): string {`,
+                `  throw new WaspSpecUserError(\`Missing environment variable '\${name}'.\`);`,
+                `}`,
+                ``,
+                `export default app({`,
+                `  name: "demo",`,
+                `  title: requireEnv("MY_SECRET"),`,
+                `  wasp: { version: "^0.16.0" },`,
+                `  spec: [],`,
+                `});`,
+            ].join("\n"));
+            expect(result).toEqual({
+                status: "error",
+                error: "Missing environment variable 'MY_SECRET'.",
+            });
+        }
+        catch (e_3) {
+            env_3.error = e_3;
+            env_3.hasError = true;
+        }
+        finally {
+            __disposeResources(env_3);
+        }
+    });
+    test("rejects namespace ref imports with a WaspSpecUserError", () => {
+        const env_4 = { stack: [], error: void 0, hasError: false };
+        try {
+            const project = __addDisposableResource(env_4, makeTempProject("wasp-spec-pipeline-namespace-"), false);
             project.writeProjectFile("src/operations.ts", `export async function archive() { return null; }\n`);
             const result = project.analyzeSpec([
                 `import { app } from "@wasp.sh/spec";`,
@@ -161,12 +192,12 @@ describe("Wasp TS spec pipeline", () => {
                 error: expect.stringContaining("Namespace imports are not supported for reference imports"),
             });
         }
-        catch (e_3) {
-            env_3.error = e_3;
-            env_3.hasError = true;
+        catch (e_4) {
+            env_4.error = e_4;
+            env_4.hasError = true;
         }
         finally {
-            __disposeResources(env_3);
+            __disposeResources(env_4);
         }
     });
 });

package/data/packages/spec/dist/__tests__/spec-pipeline/transformWaspTsSpecFile/imports.unit.test.js

@@ -2,7 +2,7 @@ import { RolldownMagicString } from "rolldown";
 import { parseAst } from "rolldown/parseAst";
 import { describe, expect, test } from "vitest";
 import { transformRefImports_mutate } from "../../../src/spec-pipeline/transformWaspTsSpecFilesPlugin/imports/index.js";
-import { SpecUserError } from "../../../src/spec/specUserError.js";
+import { WaspSpecUserError } from "../../../src/spec/waspSpecUserError.js";
 describe("transformRefImports", () => {
     test("leaves files without ref imports untouched", () => {
         expect(transformImports([`const title = "Demo";`, ``].join("\n"))).toBe([`const title = "Demo";`, ``].join("\n"));
@@ -65,11 +65,11 @@ describe("transformRefImports", () => {
     ])("transforms $caseName", ({ sourceLines, expectedLines }) => {
         expect(transformImports(sourceLines.join("\n"))).toBe(expectedLines.join("\n"));
     });
-    test("rejects namespace ref imports with a SpecUserError", () => {
+    test("rejects namespace ref imports with a WaspSpecUserError", () => {
         expect(() => transformImports([
             `import * as adminOperations from "../adminOperations" with { type: "ref" };`,
             ``,
-        ].join("\n"))).toThrow(SpecUserError);
+        ].join("\n"))).toThrow(WaspSpecUserError);
     });
     test("mentions the offending namespace binding in the error", () => {
         expect(() => transformImports([
@@ -141,7 +141,7 @@ describe("transformRefImports", () => {
                 source: `import {} from "./operations" with { type: "ref" };`,
             },
         ])("rejects $caseName", ({ source }) => {
-            expect(() => transformImports(source)).toThrow(SpecUserError);
+            expect(() => transformImports(source)).toThrow(WaspSpecUserError);
             expect(() => transformImports(source)).toThrow("must import at least one binding");
         });
     });
@@ -163,7 +163,7 @@ describe("transformRefImports", () => {
         ].join("\n"));
     });
     test("throws when transforming re-exports with ref imports", () => {
-        expect(() => transformImports(`export { MainPage } from "./src/MainPage" with { type: "ref" };`)).toThrow(SpecUserError);
+        expect(() => transformImports(`export { MainPage } from "./src/MainPage" with { type: "ref" };`)).toThrow(WaspSpecUserError);
     });
 });
 function transformImports(sourceText) {

package/data/packages/spec/dist/__tests__/spec-pipeline/transformWaspTsSpecFile/refHelper.unit.test.js

@@ -2,7 +2,7 @@ import { RolldownMagicString } from "rolldown";
 import { parseAst } from "rolldown/parseAst";
 import { describe, expect, test } from "vitest";
 import { transformRefHelper_mutate } from "../../../src/spec-pipeline/transformWaspTsSpecFilesPlugin/refHelper/index.js";
-import { SpecUserError } from "../../../src/spec/specUserError.js";
+import { WaspSpecUserError } from "../../../src/spec/waspSpecUserError.js";
 describe("transformRefHelper", () => {
     test("leaves files without a public ref import untouched", () => {
         expect(transformRefHelper([`const title = "Demo";`, ``].join("\n"))).toBe([`const title = "Demo";`, ``].join("\n"));
@@ -108,7 +108,7 @@ describe("transformRefHelper", () => {
         ].join("\n"));
     });
     test("throws when transforming re-exports of the ref helper", () => {
-        expect(() => transformRefHelper(`export { ref } from "@wasp.sh/spec";`)).toThrow(SpecUserError);
+        expect(() => transformRefHelper(`export { ref } from "@wasp.sh/spec";`)).toThrow(WaspSpecUserError);
     });
 });
 function transformRefHelper(sourceText) {

package/data/packages/spec/dist/src/appSpec.d.ts

@@ -32,7 +32,7 @@ export type Page = {
 export type Route = {
     path: string;
     to: Ref<"Page">;
-    prerender: Optional<boolean>;
+    prerender: string[];
     lazy: Optional<boolean>;
 };
 export type Action = {
@@ -158,7 +158,7 @@ export type EmailSender = {
     provider: EmailProvider;
     defaultFrom: Optional<EmailFromField>;
 };
-export type EmailProvider = "SMTP" | "SendGrid" | "Mailgun" | "Dummy";
+export type EmailProvider = "SMTP" | "SendGrid" | "Mailgun" | "Resend" | "Dummy";
 export type EmailFromField = {
     name: Optional<string>;
     email: string;

package/data/packages/spec/dist/src/appSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appSpec.d.ts","sourceRoot":"","sources":["../../src/appSpec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appSpec.d.ts","sourceRoot":"","sources":["../../src/appSpec.ts"],"names":[],"mappings":"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"}

package/data/packages/spec/dist/src/normalizePrerender.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Normalizes the public `prerender` route option into the AppSpec
+ * representation: the list of concrete paths to prerender at build time (empty
+ * when prerendering is disabled).
+ *
+ * - `true` is shorthand for "prerender this route's own path".
+ * - `false`/`undefined`/`[]` disable prerendering (empty list).
+ * - A list of paths is used as-is.
+ */
+export declare function normalizePrerender(prerender: boolean | readonly string[] | undefined, routePath: string): string[];
+//# sourceMappingURL=normalizePrerender.d.ts.map

package/data/packages/spec/dist/src/normalizePrerender.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizePrerender.d.ts","sourceRoot":"","sources":["../../src/normalizePrerender.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,OAAO,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,EAClD,SAAS,EAAE,MAAM,GAChB,MAAM,EAAE,CAQV"}

package/data/packages/spec/dist/src/normalizePrerender.js

@@ -0,0 +1,18 @@
+/**
+ * Normalizes the public `prerender` route option into the AppSpec
+ * representation: the list of concrete paths to prerender at build time (empty
+ * when prerendering is disabled).
+ *
+ * - `true` is shorthand for "prerender this route's own path".
+ * - `false`/`undefined`/`[]` disable prerendering (empty list).
+ * - A list of paths is used as-is.
+ */
+export function normalizePrerender(prerender, routePath) {
+    if (!prerender) {
+        return [];
+    }
+    if (prerender === true) {
+        return [routePath];
+    }
+    return [...prerender];
+}

package/data/packages/spec/dist/src/run.js

@@ -2,7 +2,7 @@
 import { writeFileSync } from "fs";
 import { parseProcessArgsOrThrow } from "./cli.js";
 import { analyzeApp } from "./spec/appAnalyzer.js";
-import { SpecUserError } from "./spec/specUserError.js";
+import { WaspSpecUserError } from "./spec/waspSpecUserError.js";
 await main(process.argv);
 async function main(args) {
     const { waspTsSpecPath, tsconfigPath, projectRootDir, specResultPath, entityNames, } = parseProcessArgsOrThrow(args);
@@ -20,7 +20,7 @@ async function analyze(args) {
         return { status: "ok", value: decls };
     }
     catch (error) {
-        if (error instanceof SpecUserError) {
+        if (error instanceof WaspSpecUserError) {
             return { status: "error", error: error.message };
         }
         throw error;

package/data/packages/spec/dist/src/spec/appAnalyzer.js

@@ -1,22 +1,22 @@
 import { basename } from "path";
 import { loadWaspTsSpecDefaultExport } from "../spec-pipeline/loadWaspTsSpec.js";
-import { mapApp } from "./mapApp.js";
-import { SpecUserError } from "./specUserError.js";
+import { convertWaspSpecToAppSpec } from "./mapper/index.js";
+import { WaspSpecUserError } from "./waspSpecUserError.js";
 export async function analyzeApp({ waspTsSpecPath, tsconfigPath, projectRootDir, entityNames, }) {
     const waspTsDefaultExport = await loadWaspTsSpecDefaultExport({
         specPath: waspTsSpecPath,
         tsconfigPath,
     });
     const app = getApp(basename(waspTsSpecPath), waspTsDefaultExport);
-    return mapApp(app, { entityNames, projectRootDir });
+    return convertWaspSpecToAppSpec(app, { entityNames, projectRootDir });
 }
 function getApp(waspTsSpecFile, waspTsDefaultExport) {
     if (!waspTsDefaultExport) {
-        throw new SpecUserError("Could not load your app config. " +
+        throw new WaspSpecUserError("Could not load your app config. " +
             `Make sure '${waspTsSpecFile}' includes a default export of the app.`);
     }
     if (!isApp(waspTsDefaultExport)) {
-        throw new SpecUserError(`The default export of '${waspTsSpecFile}' file must be of type 'App'` +
+        throw new WaspSpecUserError(`The default export of '${waspTsSpecFile}' file must be of type 'App'. ` +
             "Make sure you export the result of calling 'app({ ... })'");
     }
     return waspTsDefaultExport;

package/data/packages/spec/dist/src/spec/mapper/app.d.ts

@@ -0,0 +1,17 @@
+import * as AppSpec from "../../appSpec.js";
+import * as WaspSpec from "../publicApi/waspSpec.js";
+import { AppMapperContext } from "./context.js";
+export declare function mapAppSpec(app: WaspSpec.App, ctx: AppMapperContext): AppSpec.GetDeclForType<"App">;
+export declare function mapAuth(auth: WaspSpec.Auth, ctx: AppMapperContext): AppSpec.Auth;
+export declare function mapAuthMethods(methods: WaspSpec.AuthMethods, ctx: AppMapperContext): AppSpec.AuthMethods;
+export declare function mapUsernameAndPassword(usernameAndPassword: WaspSpec.UsernameAndPasswordConfig, ctx: AppMapperContext): AppSpec.UsernameAndPasswordConfig;
+export declare function mapSocialAuth(socialAuth: WaspSpec.SocialAuthConfig, ctx: AppMapperContext): AppSpec.ExternalAuthConfig;
+export declare function mapEmailAuth(emailAuth: WaspSpec.EmailAuthConfig, ctx: AppMapperContext): AppSpec.EmailAuthConfig;
+export declare function mapEmailFlow(emailFlow: WaspSpec.EmailFlowConfig, ctx: AppMapperContext): AppSpec.EmailVerificationConfig;
+export declare function mapServer(server: WaspSpec.Server, ctx: AppMapperContext): AppSpec.Server;
+export declare function mapClient(client: WaspSpec.Client, ctx: AppMapperContext): AppSpec.Client;
+export declare function mapDb(db: WaspSpec.Db, ctx: AppMapperContext): AppSpec.Db;
+export declare function mapEmailSender(emailSender: WaspSpec.EmailSender): AppSpec.EmailSender;
+export declare function mapEmailFromField(emailFromField: WaspSpec.EmailFromField): AppSpec.EmailFromField;
+export declare function mapWebSocket(webSocket: WaspSpec.WebSocket, ctx: AppMapperContext): AppSpec.WebSocket;
+//# sourceMappingURL=app.d.ts.map

package/data/packages/spec/dist/src/spec/mapper/app.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../../src/spec/mapper/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CA6B/B;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,IAAI,CA4Bd;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,QAAQ,CAAC,WAAW,EAC7B,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,WAAW,CAsBrB;AAED,wBAAgB,sBAAsB,CACpC,mBAAmB,EAAE,QAAQ,CAAC,yBAAyB,EACvD,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,yBAAyB,CAKnC;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,QAAQ,CAAC,gBAAgB,EACrC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,kBAAkB,CAM5B;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,QAAQ,CAAC,eAAe,EACnC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,eAAe,CASzB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,QAAQ,CAAC,eAAe,EACnC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,uBAAuB,CAOjC;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,CAShB;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,MAAM,CAShB;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,CAMxE;AAED,wBAAgB,cAAc,CAC5B,WAAW,EAAE,QAAQ,CAAC,WAAW,GAChC,OAAO,CAAC,WAAW,CAMrB;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,QAAQ,CAAC,cAAc,GACtC,OAAO,CAAC,cAAc,CAKxB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,QAAQ,CAAC,SAAS,EAC7B,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,SAAS,CAMnB"}

package/data/packages/spec/dist/src/spec/mapper/app.js

@@ -0,0 +1,119 @@
+export function mapAppSpec(app, ctx) {
+    const { name, wasp, title, head, auth, server, client, db, emailSender, webSocket, } = app;
+    return {
+        declType: "App",
+        declName: name,
+        declValue: {
+            wasp,
+            title,
+            head,
+            auth: auth && mapAuth(auth, ctx),
+            server: server && mapServer(server, ctx),
+            client: client && mapClient(client, ctx),
+            db: db && mapDb(db, ctx),
+            emailSender: emailSender && mapEmailSender(emailSender),
+            webSocket: webSocket && mapWebSocket(webSocket, ctx),
+        },
+    };
+}
+export function mapAuth(auth, ctx) {
+    const { userEntity, methods, onAuthFailedRedirectTo, onAuthSucceededRedirectTo, onBeforeSignup, onAfterSignup, onAfterEmailVerified, onBeforeOAuthRedirect, onBeforeLogin, onAfterLogin, } = auth;
+    return {
+        userEntity: ctx.resolveEntityRef(userEntity),
+        methods: mapAuthMethods(methods, ctx),
+        onAuthFailedRedirectTo,
+        onAuthSucceededRedirectTo,
+        onBeforeSignup: onBeforeSignup && ctx.parseRefObject(onBeforeSignup),
+        onAfterSignup: onAfterSignup && ctx.parseRefObject(onAfterSignup),
+        onAfterEmailVerified: onAfterEmailVerified && ctx.parseRefObject(onAfterEmailVerified),
+        onBeforeOAuthRedirect: onBeforeOAuthRedirect && ctx.parseRefObject(onBeforeOAuthRedirect),
+        onBeforeLogin: onBeforeLogin && ctx.parseRefObject(onBeforeLogin),
+        onAfterLogin: onAfterLogin && ctx.parseRefObject(onAfterLogin),
+    };
+}
+export function mapAuthMethods(methods, ctx) {
+    const { usernameAndPassword, slack, discord, google, gitHub, keycloak, microsoft, email, } = methods;
+    return {
+        usernameAndPassword: usernameAndPassword && mapUsernameAndPassword(usernameAndPassword, ctx),
+        slack: slack && mapSocialAuth(slack, ctx),
+        discord: discord && mapSocialAuth(discord, ctx),
+        google: google && mapSocialAuth(google, ctx),
+        gitHub: gitHub && mapSocialAuth(gitHub, ctx),
+        keycloak: keycloak && mapSocialAuth(keycloak, ctx),
+        microsoft: microsoft && mapSocialAuth(microsoft, ctx),
+        email: email && mapEmailAuth(email, ctx),
+    };
+}
+export function mapUsernameAndPassword(usernameAndPassword, ctx) {
+    const { userSignupFields } = usernameAndPassword;
+    return {
+        userSignupFields: userSignupFields && ctx.parseRefObject(userSignupFields),
+    };
+}
+export function mapSocialAuth(socialAuth, ctx) {
+    const { configFn, userSignupFields } = socialAuth;
+    return {
+        configFn: configFn && ctx.parseRefObject(configFn),
+        userSignupFields: userSignupFields && ctx.parseRefObject(userSignupFields),
+    };
+}
+export function mapEmailAuth(emailAuth, ctx) {
+    const { userSignupFields, fromField, emailVerification, passwordReset } = emailAuth;
+    return {
+        userSignupFields: userSignupFields && ctx.parseRefObject(userSignupFields),
+        fromField: mapEmailFromField(fromField),
+        emailVerification: mapEmailFlow(emailVerification, ctx),
+        passwordReset: mapEmailFlow(passwordReset, ctx),
+    };
+}
+export function mapEmailFlow(emailFlow, ctx) {
+    const { getEmailContentFn, clientRoute } = emailFlow;
+    return {
+        getEmailContentFn: getEmailContentFn && ctx.parseRefObject(getEmailContentFn),
+        clientRoute: ctx.resolveRouteRef(clientRoute),
+    };
+}
+export function mapServer(server, ctx) {
+    const { setupFn, middlewareConfigFn, envValidationSchema } = server;
+    return {
+        setupFn: setupFn && ctx.parseRefObject(setupFn),
+        middlewareConfigFn: middlewareConfigFn && ctx.parseRefObject(middlewareConfigFn),
+        envValidationSchema: envValidationSchema && ctx.parseRefObject(envValidationSchema),
+    };
+}
+export function mapClient(client, ctx) {
+    const { rootComponent, setupFn, baseDir, envValidationSchema } = client;
+    return {
+        rootComponent: rootComponent && ctx.parseRefObject(rootComponent),
+        setupFn: setupFn && ctx.parseRefObject(setupFn),
+        baseDir,
+        envValidationSchema: envValidationSchema && ctx.parseRefObject(envValidationSchema),
+    };
+}
+export function mapDb(db, ctx) {
+    const { seeds, prismaSetupFn } = db;
+    return {
+        seeds: seeds?.map(ctx.parseRefObject),
+        prismaSetupFn: prismaSetupFn && ctx.parseRefObject(prismaSetupFn),
+    };
+}
+export function mapEmailSender(emailSender) {
+    const { provider, defaultFrom } = emailSender;
+    return {
+        provider,
+        defaultFrom: defaultFrom && mapEmailFromField(defaultFrom),
+    };
+}
+export function mapEmailFromField(emailFromField) {
+    return {
+        name: emailFromField.name,
+        email: emailFromField.email,
+    };
+}
+export function mapWebSocket(webSocket, ctx) {
+    const { fn, autoConnect } = webSocket;
+    return {
+        fn: ctx.parseRefObject(fn),
+        autoConnect,
+    };
+}

package/data/packages/spec/dist/src/spec/mapper/context.d.ts

@@ -0,0 +1,19 @@
+import * as AppSpec from "../../appSpec.js";
+import * as WaspSpec from "../publicApi/waspSpec.js";
+import { AppSpecDeclTypeForWaspSpecElement } from "./specElements.js";
+export interface AppMapperContext {
+    parseRefObject(refObject: WaspSpec.Reference<unknown>): AppSpec.ExtImport;
+    resolveEntityRef(name: string): AppSpec.Ref<"Entity">;
+    resolveRouteRef(name: string): AppSpec.Ref<"Route">;
+    collectSpecElement<SpecElement extends WaspSpec.SpecElement>(specElement: SpecElement): AppSpec.Ref<AppSpecDeclTypeForWaspSpecElement<SpecElement>>;
+}
+export declare function makeAppMapperContext({ entityNames, projectRootDir, specElements, }: {
+    entityNames: string[];
+    projectRootDir: string;
+    specElements: WaspSpec.SpecElement[];
+}): {
+    ctx: AppMapperContext;
+    collectedDeclsByKey: ReadonlyMap<string, AppSpec.Decl>;
+};
+export declare function makeRefParser<T extends AppSpec.DeclType>(declType: T, declNames: string[]): (name: string) => AppSpec.Ref<T>;
+//# sourceMappingURL=context.d.ts.map

package/data/packages/spec/dist/src/spec/mapper/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/spec/mapper/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAGrD,OAAO,EACL,iCAAiC,EAGlC,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;IAE1E,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAEpD,kBAAkB,CAAC,WAAW,SAAS,QAAQ,CAAC,WAAW,EACzD,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAC,CAAC;CAChE;AAED,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,EACX,cAAc,EACd,YAAY,GACb,EAAE;IACD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC;CACtC,GAAG;IACF,GAAG,EAAE,gBAAgB,CAAC;IACtB,mBAAmB,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD,CAoCA;AAQD,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,CAAC,QAAQ,EACtD,QAAQ,EAAE,CAAC,EACX,SAAS,EAAE,MAAM,EAAE,GAClB,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAalC"}

package/data/packages/spec/dist/src/spec/mapper/context.js

@@ -0,0 +1,65 @@
+import { isEqual } from "es-toolkit";
+import { mapRefObject } from "../refObject.js";
+import { WaspSpecUserError } from "../waspSpecUserError.js";
+import { declToRef, mapSpecElement, } from "./specElements.js";
+export function makeAppMapperContext({ entityNames, projectRootDir, specElements, }) {
+    const collectedDeclsByKey = new Map();
+    const ctx = {
+        resolveEntityRef: makeRefParser("Entity", entityNames),
+        parseRefObject: (refObject) => mapRefObject(refObject, {
+            projectRootDir,
+        }),
+        resolveRouteRef: makeRefParser("Route", specElements
+            .filter((el) => el.kind === "route")
+            .map((route) => route.name)),
+        collectSpecElement: (specElement) => {
+            const newDecl = mapSpecElement(specElement, ctx);
+            const declKey = makeKeyForDecl(newDecl);
+            const existingDecl = collectedDeclsByKey.get(declKey);
+            if (existingDecl && !isEqual(existingDecl, newDecl)) {
+                throw makeConflictingDeclsError(existingDecl, newDecl);
+            }
+            collectedDeclsByKey.set(declKey, newDecl);
+            return declToRef(newDecl);
+        },
+    };
+    return { ctx, collectedDeclsByKey };
+}
+function makeKeyForDecl(decl) {
+    // We're keying by type+name since waspc allows Decls with the same name
+    // if they are different types.
+    return `${decl.declType}:${decl.declName}`;
+}
+export function makeRefParser(declType, declNames) {
+    return function parseRef(potentialRef) {
+        if (!declNames.includes(potentialRef)) {
+            throw new WaspSpecUserError(`Invalid \`${declType}\` reference: \`${potentialRef}\`\n` +
+                `Please make sure that \`${potentialRef}\` is actually defined.`);
+        }
+        return {
+            name: potentialRef,
+            declType,
+        };
+    };
+}
+function makeConflictingDeclsError(existingDecl, incomingDecl) {
+    return new WaspSpecUserError(`Conflicting configurations for the ${declTypeDisplayNames[existingDecl.declType]} \`${existingDecl.declName}\`:\n\n` +
+        `\`${existingDecl.declName}\` (A):\n${showDecl(existingDecl)}\n\n` +
+        `\`${incomingDecl.declName}\` (B):\n${showDecl(incomingDecl)}\n\n` +
+        `All definitions with the same name must produce the same configuration.\n` +
+        "If the duplication was intentional, please use a different name to differentiate them.");
+}
+const declTypeDisplayNames = {
+    App: "app",
+    Page: "page",
+    Route: "route",
+    Query: "query",
+    Action: "action",
+    Api: "API",
+    ApiNamespace: "API namespace",
+    Job: "job",
+    Crud: "CRUD",
+};
+function showDecl(decl) {
+    return JSON.stringify(decl.declValue, null, 2);
+}

package/data/packages/spec/dist/src/spec/mapper/index.d.ts

@@ -0,0 +1,7 @@
+import * as AppSpec from "../../appSpec.js";
+import * as WaspSpec from "../publicApi/waspSpec.js";
+export declare function convertWaspSpecToAppSpec(app: WaspSpec.App, { projectRootDir, entityNames, }: {
+    projectRootDir: string;
+    entityNames: string[];
+}): AppSpec.Decl[];
+//# sourceMappingURL=index.d.ts.map

package/data/packages/spec/dist/src/spec/mapper/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/spec/mapper/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAIrD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,EACE,cAAc,EACd,WAAW,GACZ,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,GACA,OAAO,CAAC,IAAI,EAAE,CAgBhB"}

package/data/packages/spec/dist/src/spec/mapper/index.js

@@ -0,0 +1,20 @@
+import { mapAppSpec } from "./app.js";
+import { makeAppMapperContext } from "./context.js";
+export function convertWaspSpecToAppSpec(app, { projectRootDir, entityNames, }) {
+    const specElements = flattenSpecElements(app.spec);
+    const { ctx, collectedDeclsByKey } = makeAppMapperContext({
+        entityNames,
+        projectRootDir,
+        specElements,
+    });
+    for (const specElement of specElements) {
+        ctx.collectSpecElement(specElement);
+    }
+    const appDecl = mapAppSpec(app, ctx);
+    return [appDecl, ...collectedDeclsByKey.values()];
+}
+function flattenSpecElements(spec) {
+    // We assert the `[spec]` as a `SpecElement[]` to avoid
+    // infinite recursion of the `WaspSpec.Spec` type.
+    return [spec].flat(Infinity);
+}

package/data/packages/spec/dist/src/spec/mapper/specElements.d.ts

@@ -0,0 +1,28 @@
+import * as AppSpec from "../../appSpec.js";
+import * as WaspSpec from "../publicApi/waspSpec.js";
+import type { AppMapperContext } from "./context.js";
+export declare const AppSpecDeclTypeForWaspSpecElementKind: {
+    readonly page: "Page";
+    readonly route: "Route";
+    readonly query: "Query";
+    readonly action: "Action";
+    readonly api: "Api";
+    readonly apiNamespace: "ApiNamespace";
+    readonly job: "Job";
+    readonly crud: "Crud";
+};
+export type AppSpecDeclTypeForWaspSpecElement<SpecElement extends WaspSpec.SpecElement> = (typeof AppSpecDeclTypeForWaspSpecElementKind)[SpecElement["kind"]];
+export declare function declToRef<SpecElement extends WaspSpec.SpecElement>(decl: AppSpec.Decl): AppSpec.Ref<AppSpecDeclTypeForWaspSpecElement<SpecElement>>;
+export declare function mapSpecElement<T extends WaspSpec.SpecElement>(el: T, ctx: AppMapperContext): AppSpec.Decl;
+export declare function mapPageSpec(page: WaspSpec.Page, ctx: AppMapperContext): AppSpec.GetDeclForType<"Page">;
+export declare function mapRouteSpec(route: WaspSpec.Route, ctx: AppMapperContext): AppSpec.GetDeclForType<"Route">;
+export declare function mapQuerySpec(query: WaspSpec.Query, ctx: AppMapperContext): AppSpec.GetDeclForType<"Query">;
+export declare function mapActionSpec(action: WaspSpec.Action, ctx: AppMapperContext): AppSpec.GetDeclForType<"Action">;
+export declare function mapApiSpec(api: WaspSpec.Api, ctx: AppMapperContext): AppSpec.GetDeclForType<"Api">;
+export declare function mapApiNamespaceSpec(apiNamespace: WaspSpec.ApiNamespace, ctx: AppMapperContext): AppSpec.GetDeclForType<"ApiNamespace">;
+export declare function mapJobSpec(job: WaspSpec.Job, ctx: AppMapperContext): AppSpec.GetDeclForType<"Job">;
+export declare function mapSchedule(schedule: WaspSpec.Schedule): AppSpec.Schedule;
+export declare function mapCrudSpec(crud: WaspSpec.Crud, ctx: AppMapperContext): AppSpec.GetDeclForType<"Crud">;
+export declare function mapCrudOperations(operations: WaspSpec.CrudOperations, ctx: AppMapperContext): AppSpec.CrudOperations;
+export declare function mapCrudOperationOptions(options: WaspSpec.CrudOperationOptions, ctx: AppMapperContext): AppSpec.CrudOperationOptions;
+//# sourceMappingURL=specElements.d.ts.map

package/data/packages/spec/dist/src/spec/mapper/specElements.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"specElements.d.ts","sourceRoot":"","sources":["../../../../src/spec/mapper/specElements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,eAAO,MAAM,qCAAqC;;;;;;;;;CAYjD,CAAC;AAEF,MAAM,MAAM,iCAAiC,CAC3C,WAAW,SAAS,QAAQ,CAAC,WAAW,IACtC,CAAC,OAAO,qCAAqC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AAExE,wBAAgB,SAAS,CAAC,WAAW,SAAS,QAAQ,CAAC,WAAW,EAChE,IAAI,EAAE,OAAO,CAAC,IAAI,GACjB,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAC,CAI7D;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,QAAQ,CAAC,WAAW,EAC3D,EAAE,EAAE,CAAC,EACL,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,IAAI,CAqBd;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAUhC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,EACrB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAYjC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,EACrB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAWjC;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAWlC;AAED,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAc/B;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,QAAQ,CAAC,YAAY,EACnC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAUxC;AAED,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,GAAG,EACjB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAe/B;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAOzE;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAUhC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,QAAQ,CAAC,cAAc,EACnC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,cAAc,CASxB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,EACtC,GAAG,EAAE,gBAAgB,GACpB,OAAO,CAAC,oBAAoB,CAM9B"}