@ramathibodi/nuxt-commons 0.1.10 → 0.1.12

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.1.10"
+  "version": "0.1.12"
 }

package/dist/runtime/composables/graphql.mjs

@@ -21,11 +21,13 @@ export function useGraphQl() {
     return new Promise((resolve, reject) => {
       const { onResult, onError } = useQuery(gql(builder.query), builder.variables, { fetchPolicy: cache ? "cache-first" : "no-cache" });
       onResult((queryResult) => {
-        const dataObject = queryResult.data;
-        try {
-          resolve(dataObject[operation]);
-        } catch (error) {
-          reject(error);
+        if (!queryResult.loading) {
+          const dataObject = queryResult.data;
+          try {
+            resolve(dataObject[operation]);
+          } catch (error) {
+            reject(error);
+          }
         }
       });
       onError((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramathibodi/nuxt-commons",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Ramathibodi Nuxt modules for common components",
   "repository": {
     "type": "git",

package/scripts/postInstall.cjs

@@ -25,15 +25,6 @@ function copyDirectory(srcDir, destDir) {
     }
 }
 
-// Function to add copied files to git
-function addFilesToGit(files, projectRoot) {
-    files.forEach(file => {
-        const filePath = path.join(projectRoot, file);
-        execSync(`git add ${filePath}`, { stdio: 'inherit' });
-        console.log(`Added ${filePath} to git`);
-    });
-}
-
 // Function to modify package.json to add a new script
 function addScriptToPackageJson(scriptName, scriptCommand) {
     const packageJsonPath = path.join(process.env.INIT_CWD, 'package.json');
@@ -68,9 +59,9 @@ copyDirectory(srcDir, destDir);
 // Add new script to package.json
 addScriptToPackageJson('codegen', 'graphql-codegen --require dotenv/config --config ./.codegen/codegen.ts dotenv_config_path=.env');
 
-// Add copied files to git
-const copiedFiles = fs.readdirSync(srcDir).map(file => path.join('.', file));
-addFilesToGit(copiedFiles, destDir);
-
 // Run npm run codegen safely
-runCodegen(destDir);
+if (!fs.existsSync(path.join(destDir, "types","graphql.ts")) || !fs.existsSync(path.join(destDir, "composables","graphqlObject.ts"))) {
+    if (process.env.NUXT_PUBLIC_WS_GRAPHQL) runCodegen(destDir);
+} else {
+    console.log('Skipping codegen');
+}

package/templates/.codegen/codegen.ts

@@ -26,7 +26,7 @@ const config: CodegenConfig = {
       },'./.codegen/plugin-schema-object.js'],
     },
   },
-  hooks: { afterAllFileWrite: ['prettier --parser typescript --tab-width 4 --write','git add'] }
+  hooks: { afterAllFileWrite: ['prettier --parser typescript --tab-width 4 --write'] }
 };
 
 export default config;

package/templates/.codegen/plugin-schema-object.js

@@ -96,6 +96,12 @@ module.exports = {
         return `
         import * as graphQlClass from "~/types/graphql"
         import { useGraphQlOperation } from "#imports";
+        import type {
+            graphqlInputObject,
+            graphqlOperationObject,
+            graphqlTypeObject,
+            graphqlVariable
+          } from "#build/types/graphqlOperation";
         
         export const scalarType = ${JSON.stringify(scalarType)}