houdini 0.16.0 → 0.16.2

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # houdini
 
+## 0.16.2
+
+### ✨ Features
+
+-   [#534](https://github.com/HoudiniGraphql/houdini/pull/534) [`599fc3c`](https://github.com/HoudiniGraphql/houdini/commit/599fc3c9dc7843c40ab25b4c4763e1b3ed9df6c7) Thanks [@fehnomenal](https://github.com/fehnomenal)! - Add ability to control masking for a specific fragment
+
+### 🐛 Fixes
+
+-   [#540](https://github.com/HoudiniGraphql/houdini/pull/540) [`8addece`](https://github.com/HoudiniGraphql/houdini/commit/8addecef1063dfe7d48f539d1c9f6b72949d7fd2) Thanks [@jycouet](https://github.com/jycouet)! - Warn users when endpoint is not present in dev instead of crashing
+
+*   [#542](https://github.com/HoudiniGraphql/houdini/pull/542) [`3697e33`](https://github.com/HoudiniGraphql/houdini/commit/3697e33ec644f87f13878b74413b507843d90325) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fix bug when loading queries in a layout file
+
+-   [#539](https://github.com/HoudiniGraphql/houdini/pull/539) [`a7d4c2e`](https://github.com/HoudiniGraphql/houdini/commit/a7d4c2e9f650b86f8e19833079c286a64f807d2a) Thanks [@jycouet](https://github.com/jycouet)! - mono repo support
+
+-   [#537](https://github.com/HoudiniGraphql/houdini/pull/537) [`191c775`](https://github.com/HoudiniGraphql/houdini/commit/191c7750a33b11cdbc8f5e7b9719641d5b0a21c5) Thanks [@jycouet](https://github.com/jycouet)! - init cmd, vite.config.ts generated file
+
+## 0.16.1
+
+### 🐛 Fixes
+
+-   [#527](https://github.com/HoudiniGraphql/houdini/pull/527) [`9b87678`](https://github.com/HoudiniGraphql/houdini/commit/9b876789140978c0726ed9a708677c7c75f3e19b) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Update init command to work with latest file template
+
 ## 0.16.0
 
 ### ⚠️ Breaking Changes
@@ -26,24 +48,26 @@
 
 *   [#449](https://github.com/HoudiniGraphql/houdini/pull/449) [`59257d1`](https://github.com/HoudiniGraphql/houdini/commit/59257d1dffa6c1d9d250ba0964c6f1f0c35da048) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - You can now define the prefix of your global stores with globalStorePrefix param in the config.
 
--   [#485](https://github.com/HoudiniGraphql/houdini/pull/485) [`c21942c`](https://github.com/HoudiniGraphql/houdini/commit/c21942c4a364dbaca4008dc0ad8263fdc940da84) Thanks [@jycouet](https://github.com/jycouet)! - fix peerDependencies of houdini, graphql needs to be <16
-
-*   [#490](https://github.com/HoudiniGraphql/houdini/pull/490) [`71caba7`](https://github.com/HoudiniGraphql/houdini/commit/71caba7c6b23e73754934fd604030f3cd1a9b74b) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - fix generated types for optimistic responses
-
--   [#487](https://github.com/HoudiniGraphql/houdini/pull/487) [`0544a28`](https://github.com/HoudiniGraphql/houdini/commit/0544a2846125673f2f0e67cb02135554458edfb0) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fix issues when rendering kit applications with framework set to "svelte"
-
 *   [#508](https://github.com/HoudiniGraphql/houdini/pull/508) [`60ecb33`](https://github.com/HoudiniGraphql/houdini/commit/60ecb333a1396f9aa7244eac2f38741a58e7281f) Thanks [@fehnomenal](https://github.com/fehnomenal)! - added support for sessions
 
 *   [#449](https://github.com/HoudiniGraphql/houdini/pull/449) [`59257d1`](https://github.com/HoudiniGraphql/houdini/commit/59257d1dffa6c1d9d250ba0964c6f1f0c35da048) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - graphql tags return store references
 
 *   [#449](https://github.com/HoudiniGraphql/houdini/pull/449) [`59257d1`](https://github.com/HoudiniGraphql/houdini/commit/59257d1dffa6c1d9d250ba0964c6f1f0c35da048) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - add generated typedefs for route functions
 
--   [#523](https://github.com/HoudiniGraphql/houdini/pull/523) [`2c5174c`](https://github.com/HoudiniGraphql/houdini/commit/2c5174c248bf2ae5ee3a8d3a7e910213e859ae2a) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - fix circular import with HoudiniClient
-
 -   [#494](https://github.com/HoudiniGraphql/houdini/pull/494) [`5573cfa`](https://github.com/HoudiniGraphql/houdini/commit/5573cfa184d2da322030695044997f5fbf6542bd) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - add onError hook
 
 -   [#494](https://github.com/HoudiniGraphql/houdini/pull/494) [`5573cfa`](https://github.com/HoudiniGraphql/houdini/commit/5573cfa184d2da322030695044997f5fbf6542bd) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - add `quietQueryError` config value to suppress all query errors
 
+### 🐛 Fixes
+
+-   [#485](https://github.com/HoudiniGraphql/houdini/pull/485) [`c21942c`](https://github.com/HoudiniGraphql/houdini/commit/c21942c4a364dbaca4008dc0ad8263fdc940da84) Thanks [@jycouet](https://github.com/jycouet)! - fix peerDependencies of houdini, graphql needs to be <16
+
+-   [#523](https://github.com/HoudiniGraphql/houdini/pull/523) [`2c5174c`](https://github.com/HoudiniGraphql/houdini/commit/2c5174c248bf2ae5ee3a8d3a7e910213e859ae2a) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - fix circular import with HoudiniClient
+
+-   [#490](https://github.com/HoudiniGraphql/houdini/pull/490) [`71caba7`](https://github.com/HoudiniGraphql/houdini/commit/71caba7c6b23e73754934fd604030f3cd1a9b74b) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - fix generated types for optimistic responses
+
+-   [#487](https://github.com/HoudiniGraphql/houdini/pull/487) [`0544a28`](https://github.com/HoudiniGraphql/houdini/commit/0544a2846125673f2f0e67cb02135554458edfb0) Thanks [@AlecAivazis](https://github.com/AlecAivazis)! - Fix issues when rendering kit applications with framework set to "svelte"
+
 ## 0.15.9
 
 ### Patch Changes

package/build/cmd/generators/typescript/index.js

@@ -71,8 +71,6 @@ async function typescriptGenerator(config, docs) {
             config,
             filepath: filename,
             selections: definition.selectionSet.selections,
-            // only globally include internal fragment values if masking is disabled
-            includeFragments: config.disableMasking,
             fragmentDefinitions,
         });
         if (definition?.kind === 'OperationDefinition') {

package/build/cmd/init.js

@@ -158,7 +158,7 @@ async function init(_path, args, withRunningCheck = true) {
     else if (framework === 'svelte') {
         await updateSvelteMainJs(targetPath);
     }
-    await updateViteConfig(targetPath, framework);
+    await updateViteConfig(targetPath, framework, typescript);
     await tjsConfig(targetPath, framework);
     // we're done!
     console.log();
@@ -275,8 +275,8 @@ async function tjsConfig(targetPath, framework) {
     catch { }
     return false;
 }
-async function updateViteConfig(targetPath, framework) {
-    const viteConfigPath = path_1.default.join(targetPath, 'vite.config.js');
+async function updateViteConfig(targetPath, framework, typescript) {
+    const viteConfigPath = path_1.default.join(targetPath, `vite.config${typescript ? '.ts' : '.js'}`);
     const oldViteConfig1 = `import { sveltekit } from '@sveltejs/kit/vite';
 
 /** @type {import('vite').UserConfig} */
@@ -286,13 +286,15 @@ const config = {
 
 export default config;
 `;
-    const oldViteConfig2 = `import { defineConfig } from 'vite'
-import { svelte } from '@sveltejs/vite-plugin-svelte'
+    const oldViteConfig2 = `import { sveltekit } from '@sveltejs/kit/vite';
+import type { UserConfig } from 'vite';
+
+const config: UserConfig = {
+	plugins: [sveltekit()]
+};
+
+export default config;
 
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [svelte()]
-})
 `;
     const viteConfigKit = `import { sveltekit } from '@sveltejs/kit/vite';
 import houdini from 'houdini/vite';
@@ -302,6 +304,16 @@ const config = {
 	plugins: [houdini(), sveltekit()],
 }
 
+export default config;
+`;
+    const viteConfigKitTs = `import { sveltekit } from '@sveltejs/kit/vite';
+import houdini from 'houdini/vite';
+import type { UserConfig } from "vite";
+
+const config: UserConfig = {
+	plugins: [houdini(), sveltekit()],
+}
+
 export default config;
 `;
     const viteConfigSvelte = `import { svelte } from '@sveltejs/vite-plugin-svelte';
@@ -314,34 +326,76 @@ const config = {
 
 export default config;
 `;
+    const viteConfigSvelteTs = `import { svelte } from '@sveltejs/vite-plugin-svelte';
+import houdini from 'houdini/vite';
+import type { UserConfig } from "vite";
+
+const config: UserConfig = {
+	plugins: [houdini(), svelte()],
+}
+
+export default config;
+`;
+    let content = 'NOTHING!';
+    if (framework === 'kit' && typescript) {
+        content = viteConfigKitTs;
+    }
+    else if (framework === 'kit' && !typescript) {
+        content = viteConfigKit;
+    }
+    else if (framework === 'svelte' && typescript) {
+        content = viteConfigSvelteTs;
+    }
+    else if (framework === 'svelte' && !typescript) {
+        content = viteConfigSvelte;
+    }
+    else {
+        throw new Error('Unknown updateViteConfig()');
+    }
     // write the vite config file
     await updateFile({
         projectPath: targetPath,
         filepath: viteConfigPath,
-        content: framework === 'kit' ? viteConfigKit : viteConfigSvelte,
+        content,
         old: [oldViteConfig1, oldViteConfig2],
     });
+    if (typescript) {
+        await updateFile({
+            projectPath: targetPath,
+            filepath: viteConfigPath,
+            content: framework === 'kit' ? viteConfigKitTs : viteConfigSvelteTs,
+            old: [oldViteConfig1, oldViteConfig2],
+        });
+    }
+    else {
+        await updateFile({
+            projectPath: targetPath,
+            filepath: viteConfigPath,
+            content: framework === 'kit' ? viteConfigKit : viteConfigSvelte,
+            old: [oldViteConfig1, oldViteConfig2],
+        });
+    }
 }
 async function updateSvelteConfig(targetPath) {
     const svelteConfigPath = path_1.default.join(targetPath, 'svelte.config.js');
     const newContent = `import adapter from '@sveltejs/adapter-auto';
-	import preprocess from 'svelte-preprocess';
-	
-	/** @type {import('@sveltejs/kit').Config} */
-	const config = {
-		// Consult https://github.com/sveltejs/svelte-preprocess
-		// for more information about preprocessors
-		preprocess: preprocess(),
-	
-		kit: {
-			adapter: adapter(),
-			alias: {
-				$houdini: './$houdini',
-			}
+import preprocess from 'svelte-preprocess';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	// Consult https://github.com/sveltejs/svelte-preprocess
+	// for more information about preprocessors
+	preprocess: preprocess(),
+
+	kit: {
+		adapter: adapter(),
+		alias: {
+			$houdini: './$houdini',
 		}
-	};
-	
-	export default config;
+	}
+};
+
+export default config;
 `;
     const oldSvelteConfig1 = `import adapter from '@sveltejs/adapter-auto';
 import preprocess from 'svelte-preprocess';

package/build/cmd/transforms/schema.js

@@ -88,9 +88,18 @@ directive @${config.argumentsDirective} on FRAGMENT_DEFINITION
 directive @${config.cacheDirective}(${config.cachePolicyArg}: CachePolicy, ${config.cachePartialArg}: Boolean) on QUERY
 
 """
-	@${config.houdiniDirective} is used to configure houdini's internal behavior such as opting-in an automatic load
-"""
-directive @${config.houdiniDirective}(load: Boolean = true) on QUERY
+	@${config.houdiniDirective} is used to configure houdini's internal behavior
+"""
+directive @${config.houdiniDirective}(
+	"""
+	Opt-in to an automatic load function (only valid when used at queries)
+	"""
+	load: Boolean! = true
+	"""
+	Mask fragment fields (only valid when used at a fragment spread)
+	"""
+	mask: Boolean! = ${config.disableMasking ? 'false' : 'true'}
+) on QUERY | FRAGMENT_SPREAD
 `;
     // if the config does not have the cache directive, then we need to add it
     let currentSchema = graphql.printSchema(config.schema);

package/build/cmd/utils/flattenSelections.d.ts

@@ -1,10 +1,9 @@
 import * as graphql from 'graphql';
 import { Config } from '../../common';
-export declare function flattenSelections({ config, filepath, selections, includeFragments, fragmentDefinitions, }: {
+export declare function flattenSelections({ config, filepath, selections, fragmentDefinitions, }: {
     config: Config;
     filepath: string;
     selections: readonly graphql.SelectionNode[];
-    includeFragments: boolean;
     fragmentDefinitions: {
         [name: string]: graphql.FragmentDefinitionNode;
     };

package/build/cmd/utils/flattenSelections.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flattenSelections = void 0;
 const common_1 = require("../../common");
-function flattenSelections({ config, filepath, selections, includeFragments, fragmentDefinitions, }) {
+function flattenSelections({ config, filepath, selections, fragmentDefinitions, }) {
     // collect all of the fields together
     const fields = new FieldCollection({
         config,
         filepath,
         selections,
-        includeFragments,
         fragmentDefinitions,
     });
     // convert the flat fields into a selection set
@@ -17,9 +16,7 @@ function flattenSelections({ config, filepath, selections, includeFragments, fra
 exports.flattenSelections = flattenSelections;
 class FieldCollection {
     constructor(args) {
-        this.includeFragments = false;
         this.config = args.config;
-        this.includeFragments = args.includeFragments;
         this.fragmentDefinitions = args.fragmentDefinitions;
         this.fields = {};
         this.inlineFragments = {};
@@ -80,8 +77,15 @@ class FieldCollection {
             // the application of the fragment has been validated already so track it
             // so we can recreate
             this.fragmentSpreads[selection.name.value] = selection;
+            // find whether to include fragment fields
+            const houdiniDirective = selection.directives?.find(({ name }) => name.value === this.config.houdiniDirective);
+            const maskArgument = houdiniDirective?.arguments?.find(({ name }) => name.value === 'mask');
+            let includeFragments = this.config.disableMasking;
+            if (maskArgument?.value.kind === 'BooleanValue') {
+                includeFragments = !maskArgument.value.value;
+            }
             // we're finished if we're not supposed to include fragments in the selection
-            if (!this.includeFragments) {
+            if (!includeFragments) {
                 return;
             }
             const definition = this.fragmentDefinitions[selection.name.value];
@@ -113,7 +117,6 @@ class FieldCollection {
     empty() {
         return new FieldCollection({
             config: this.config,
-            includeFragments: this.includeFragments,
             fragmentDefinitions: this.fragmentDefinitions,
             selections: [],
             filepath: this.filepath,

package/build/cmd/utils/introspection.d.ts

@@ -1,2 +1 @@
-import * as graphql from 'graphql';
-export declare function pullSchema(url: string, schemaPath: string, headers?: Record<string, string>): Promise<graphql.GraphQLSchema>;
+export declare function pullSchema(url: string, schemaPath: string, headers?: Record<string, string>): Promise<boolean>;

package/build/cmd/utils/introspection.js

@@ -52,12 +52,11 @@ async function pullSchema(url, schemaPath, headers) {
         else {
             await (0, fs_1.writeFile)(schemaPath, JSON.stringify(jsonSchema));
         }
-        // return the schema for usage in --pull-schema
-        return schema;
+        return true;
     }
     catch (e) {
-        console.log(`❌ Encountered error when pulling your latest schema: ` + e.message);
-        process.exit(0);
+        console.warn(`⚠️  Couldn't pull your latest schema: ` + e.message);
     }
+    return false;
 }
 exports.pullSchema = pullSchema;